From 78fdf79b00d4ab5fa9863348556f3b46425d5d6f Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 21 Dec 2009 16:17:29 +0000 Subject: [PATCH] * ecore: Cleanup some warning. SVN revision: 44631 --- legacy/ecore/src/lib/ecore/ecore_pipe.c | 3 --- legacy/ecore/src/lib/ecore/ecore_thread.c | 2 +- legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c | 2 +- legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c | 2 ++ legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c | 2 -- 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__) p->fd_handler = NULL; return ECORE_CALLBACK_CANCEL; } - else - goto _win32_done; } #endif } - _win32_done: if (!p->passed_data) p->passed_data = malloc(p->len); 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), work = malloc(sizeof (Ecore_Pthread_Worker)); if (!work) { - func_cancel(data); + func_cancel((void*) data); return NULL; } 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, XKeyEvent *xevent) { Ecore_Event_Key *e; - const char *compose = NULL; + char *compose = NULL; char *tmp = NULL; char *keyname; 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 if (!draw) draw = DefaultRootWindow(_ecore_x_disp); + memset(&gcv, 0, sizeof (gcv)); + for (i = 0, index = 0, mask = 1; i <= 22; i++, mask <<= 1) { 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 xev.xclient.data.l[2] = current_win; xev.xclient.data.l[3] = 0; xev.xclient.data.l[4] = 0; - xev.xclient.data.l[5] = 0; XSendEvent(_ecore_x_disp, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); @@ -1066,7 +1065,6 @@ ecore_x_netwm_ping_send(Ecore_X_Window win) xev.xclient.data.l[2] = win; xev.xclient.data.l[3] = 0; xev.xclient.data.l[4] = 0; - xev.xclient.data.l[5] = 0; XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev); }