summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2009-12-21 16:17:29 +0000
committerCedric BAIL <cedric.bail@free.fr>2009-12-21 16:17:29 +0000
commit78fdf79b00d4ab5fa9863348556f3b46425d5d6f (patch)
treecf58ce4d6d7a543e3e2b8da9ef97d61ebc0f7784 /legacy
parenta27c701f27d874fd4f1d476ef0e501a3cd5ffcc9 (diff)
* ecore: Cleanup some warning.
SVN revision: 44631
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_pipe.c3
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_thread.c2
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c2
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c2
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c2
5 files changed, 4 insertions, 7 deletions
diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/legacy/ecore/src/lib/ecore/ecore_pipe.c
index cd6146e5b2..149d6f8ce2 100644
--- a/legacy/ecore/src/lib/ecore/ecore_pipe.c
+++ b/legacy/ecore/src/lib/ecore/ecore_pipe.c
@@ -535,13 +535,10 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
535 p->fd_handler = NULL; 535 p->fd_handler = NULL;
536 return ECORE_CALLBACK_CANCEL; 536 return ECORE_CALLBACK_CANCEL;
537 } 537 }
538 else
539 goto _win32_done;
540 } 538 }
541#endif 539#endif
542 } 540 }
543 541
544 _win32_done:
545 if (!p->passed_data) 542 if (!p->passed_data)
546 p->passed_data = malloc(p->len); 543 p->passed_data = malloc(p->len);
547 544
diff --git a/legacy/ecore/src/lib/ecore/ecore_thread.c b/legacy/ecore/src/lib/ecore/ecore_thread.c
index 39cc8290ab..43e4d51d98 100644
--- a/legacy/ecore/src/lib/ecore/ecore_thread.c
+++ b/legacy/ecore/src/lib/ecore/ecore_thread.c
@@ -228,7 +228,7 @@ ecore_thread_run(void (*func_heavy)(void *data),
228 work = malloc(sizeof (Ecore_Pthread_Worker)); 228 work = malloc(sizeof (Ecore_Pthread_Worker));
229 if (!work) 229 if (!work)
230 { 230 {
231 func_cancel(data); 231 func_cancel((void*) data);
232 return NULL; 232 return NULL;
233 } 233 }
234 234
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
index 7ac72ee0da..49eccc72c7 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -233,7 +233,7 @@ _ecore_key_press(int event,
233 XKeyEvent *xevent) 233 XKeyEvent *xevent)
234{ 234{
235 Ecore_Event_Key *e; 235 Ecore_Event_Key *e;
236 const char *compose = NULL; 236 char *compose = NULL;
237 char *tmp = NULL; 237 char *tmp = NULL;
238 char *keyname; 238 char *keyname;
239 char *key; 239 char *key;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
index ef0ff58437..a76ab5f408 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
@@ -30,6 +30,8 @@ ecore_x_gc_new(Ecore_X_Drawable draw, Ecore_X_GC_Value_Mask value_mask, const un
30 30
31 if (!draw) draw = DefaultRootWindow(_ecore_x_disp); 31 if (!draw) draw = DefaultRootWindow(_ecore_x_disp);
32 32
33 memset(&gcv, 0, sizeof (gcv));
34
33 for (i = 0, index = 0, mask = 1; i <= 22; i++, mask <<= 1) 35 for (i = 0, index = 0, mask = 1; i <= 22; i++, mask <<= 1)
34 { 36 {
35 switch (mask & value_mask) 37 switch (mask & value_mask)
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
index 844702d54b..277566f5b5 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
@@ -276,7 +276,6 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root, Ecore_X_Window win, int
276 xev.xclient.data.l[2] = current_win; 276 xev.xclient.data.l[2] = current_win;
277 xev.xclient.data.l[3] = 0; 277 xev.xclient.data.l[3] = 0;
278 xev.xclient.data.l[4] = 0; 278 xev.xclient.data.l[4] = 0;
279 xev.xclient.data.l[5] = 0;
280 279
281 XSendEvent(_ecore_x_disp, root, False, 280 XSendEvent(_ecore_x_disp, root, False,
282 SubstructureRedirectMask | SubstructureNotifyMask, &xev); 281 SubstructureRedirectMask | SubstructureNotifyMask, &xev);
@@ -1066,7 +1065,6 @@ ecore_x_netwm_ping_send(Ecore_X_Window win)
1066 xev.xclient.data.l[2] = win; 1065 xev.xclient.data.l[2] = win;
1067 xev.xclient.data.l[3] = 0; 1066 xev.xclient.data.l[3] = 0;
1068 xev.xclient.data.l[4] = 0; 1067 xev.xclient.data.l[4] = 0;
1069 xev.xclient.data.l[5] = 0;
1070 1068
1071 XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev); 1069 XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev);
1072} 1070}