From a82e7511aa6fd90ccea55e8d0f6d5a045d67e8c8 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Fri, 15 Jan 2010 20:51:01 +0000 Subject: [PATCH] make clang happy SVN revision: 45197 --- legacy/ethumb/src/bin/ethumbd_child.c | 1 - legacy/ethumb/src/lib/client/Ethumb_Client.c | 9 ++++----- legacy/ethumb/src/plugins/emotion/emotion.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/legacy/ethumb/src/bin/ethumbd_child.c b/legacy/ethumb/src/bin/ethumbd_child.c index 252450bf5f..59f7c0d24e 100644 --- a/legacy/ethumb/src/bin/ethumbd_child.c +++ b/legacy/ethumb/src/bin/ethumbd_child.c @@ -666,7 +666,6 @@ _ec_fd_handler(void *data, Ecore_Fd_Handler *fd_handler) DBG("received op: %d\n", op_id); - r = 1; switch (op_id) { case ETHUMBD_OP_NEW: diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.c b/legacy/ethumb/src/lib/client/Ethumb_Client.c index f41fb83b97..0b33a4b6d4 100644 --- a/legacy/ethumb/src/lib/client/Ethumb_Client.c +++ b/legacy/ethumb/src/lib/client/Ethumb_Client.c @@ -990,8 +990,8 @@ _ethumb_client_generated_cb(void *data, DBusMessage *msg) { DBusMessageIter iter; dbus_int32_t id = -1; - const char *thumb; - const char *thumb_key; + const char *thumb = NULL; + const char *thumb_key = NULL; Ethumb_Client *client = data; int t; dbus_bool_t success; @@ -1054,8 +1054,8 @@ _ethumb_client_generated_cb(void *data, DBusMessage *msg) } end: - eina_stringshare_del(thumb); - eina_stringshare_del(thumb_key); + if (thumb) eina_stringshare_del(thumb); + if (thumb_key) eina_stringshare_del(thumb_key); } static void @@ -1254,7 +1254,6 @@ ethumb_client_generate_cancel(Ethumb_Client *client, int id, Ethumb_Client_Gener if (pending->free_data) pending->free_data(pending->data); free(pending); - found = 1; break; } diff --git a/legacy/ethumb/src/plugins/emotion/emotion.c b/legacy/ethumb/src/plugins/emotion/emotion.c index 3abd5b539f..efa04979d8 100644 --- a/legacy/ethumb/src/plugins/emotion/emotion.c +++ b/legacy/ethumb/src/plugins/emotion/emotion.c @@ -299,7 +299,6 @@ _generate_thumb(Ethumb *e) Evas_Object *o; int r; const char *file; - float start; Ethumb_Thumb_Format f; struct _emotion_plugin *_plugin = calloc(sizeof(struct _emotion_plugin), 1); @@ -318,7 +317,7 @@ _generate_thumb(Ethumb *e) _plugin->video = o; ethumb_file_get(e, &file, NULL); - start = ethumb_video_start_get(e); + ethumb_video_start_get(e); f = ethumb_thumb_format_get(e); emotion_object_file_set(o, file);