summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2010-01-15 20:51:01 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2010-01-15 20:51:01 +0000
commita82e7511aa6fd90ccea55e8d0f6d5a045d67e8c8 (patch)
tree47b96f665316fab97694b4579309b6dbb3c390bf /legacy/ethumb
parentba74181c5cdea89b2ce48b88066dc3cf7a8c27d3 (diff)
make clang happy
SVN revision: 45197
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/src/bin/ethumbd_child.c1
-rw-r--r--legacy/ethumb/src/lib/client/Ethumb_Client.c9
-rw-r--r--legacy/ethumb/src/plugins/emotion/emotion.c3
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)
666 666
667 DBG("received op: %d\n", op_id); 667 DBG("received op: %d\n", op_id);
668 668
669 r = 1;
670 switch (op_id) 669 switch (op_id)
671 { 670 {
672 case ETHUMBD_OP_NEW: 671 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)
990{ 990{
991 DBusMessageIter iter; 991 DBusMessageIter iter;
992 dbus_int32_t id = -1; 992 dbus_int32_t id = -1;
993 const char *thumb; 993 const char *thumb = NULL;
994 const char *thumb_key; 994 const char *thumb_key = NULL;
995 Ethumb_Client *client = data; 995 Ethumb_Client *client = data;
996 int t; 996 int t;
997 dbus_bool_t success; 997 dbus_bool_t success;
@@ -1054,8 +1054,8 @@ _ethumb_client_generated_cb(void *data, DBusMessage *msg)
1054 } 1054 }
1055 1055
1056end: 1056end:
1057 eina_stringshare_del(thumb); 1057 if (thumb) eina_stringshare_del(thumb);
1058 eina_stringshare_del(thumb_key); 1058 if (thumb_key) eina_stringshare_del(thumb_key);
1059} 1059}
1060 1060
1061static void 1061static void
@@ -1254,7 +1254,6 @@ ethumb_client_generate_cancel(Ethumb_Client *client, int id, Ethumb_Client_Gener
1254 if (pending->free_data) 1254 if (pending->free_data)
1255 pending->free_data(pending->data); 1255 pending->free_data(pending->data);
1256 free(pending); 1256 free(pending);
1257 found = 1;
1258 break; 1257 break;
1259 } 1258 }
1260 1259
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)
299 Evas_Object *o; 299 Evas_Object *o;
300 int r; 300 int r;
301 const char *file; 301 const char *file;
302 float start;
303 Ethumb_Thumb_Format f; 302 Ethumb_Thumb_Format f;
304 struct _emotion_plugin *_plugin = calloc(sizeof(struct _emotion_plugin), 1); 303 struct _emotion_plugin *_plugin = calloc(sizeof(struct _emotion_plugin), 1);
305 304
@@ -318,7 +317,7 @@ _generate_thumb(Ethumb *e)
318 _plugin->video = o; 317 _plugin->video = o;
319 318
320 ethumb_file_get(e, &file, NULL); 319 ethumb_file_get(e, &file, NULL);
321 start = ethumb_video_start_get(e); 320 ethumb_video_start_get(e);
322 f = ethumb_thumb_format_get(e); 321 f = ethumb_thumb_format_get(e);
323 322
324 emotion_object_file_set(o, file); 323 emotion_object_file_set(o, file);