summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2010-03-02 00:39:37 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2010-03-02 00:39:37 +0000
commit144e732a24d6530a884c4b827c529550477f94fe (patch)
tree021ddcc1385d3a6d4d67498d43472a2c334cc6c5 /legacy/ethumb
parent6a6ad0f603f4389ee8d216933d519834ee887479 (diff)
remove spurious \n for eina_log messages.
SVN revision: 46756
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/src/bin/ethumbd.c130
-rw-r--r--legacy/ethumb/src/bin/ethumbd_child.c56
2 files changed, 93 insertions, 93 deletions
diff --git a/legacy/ethumb/src/bin/ethumbd.c b/legacy/ethumb/src/bin/ethumbd.c
index 8faec801b3..a17b80a4e7 100644
--- a/legacy/ethumb/src/bin/ethumbd.c
+++ b/legacy/ethumb/src/bin/ethumbd.c
@@ -285,7 +285,7 @@ _ethumbd_write_safe(struct _Ethumbd *ed, const void *buf, ssize_t size)
285 285
286 if (!ed->slave.exe) 286 if (!ed->slave.exe)
287 { 287 {
288 ERR("slave process isn't running.\n"); 288 ERR("slave process isn't running.");
289 return 0; 289 return 0;
290 } 290 }
291 291
@@ -342,7 +342,7 @@ _generated_cb(struct _Ethumbd *ed, Eina_Bool success, const char *thumb_path, co
342{ 342{
343 int i = ed->queue.current; 343 int i = ed->queue.current;
344 344
345 DBG("thumbnail ready at: \"%s:%s\"\n", thumb_path, thumb_key); 345 DBG("thumbnail ready at: \"%s:%s\"", thumb_path, thumb_key);
346 346
347 if (ed->queue.table[i].used) 347 if (ed->queue.table[i].used)
348 _ethumb_dbus_generated_signal 348 _ethumb_dbus_generated_signal
@@ -419,7 +419,7 @@ _ethumbd_slave_alloc_cmd(struct _Ethumbd *ed, int ssize, char *sdata)
419 419
420 scmd = (int *)sdata; 420 scmd = (int *)sdata;
421 if (ssize < sizeof(*scmd)) { 421 if (ssize < sizeof(*scmd)) {
422 ERR("could not read size of command.\n"); 422 ERR("could not read size of command.");
423 return 0; 423 return 0;
424 } 424 }
425 ed->slave.bufcmd = malloc(*scmd); 425 ed->slave.bufcmd = malloc(*scmd);
@@ -439,7 +439,7 @@ _ethumbd_slave_data_read_cb(void *data, int type, void *event)
439 439
440 if (ev->exe != ed->slave.exe) 440 if (ev->exe != ed->slave.exe)
441 { 441 {
442 ERR("PARENT ERROR: slave != ev->exe\n"); 442 ERR("PARENT ERROR: slave != ev->exe");
443 return 0; 443 return 0;
444 } 444 }
445 445
@@ -489,15 +489,15 @@ _ethumbd_slave_del_cb(void *data, int type, void *event)
489 return 1; 489 return 1;
490 490
491 if (ev->exited) 491 if (ev->exited)
492 ERR("slave exited with code: %d\n", ev->exit_code); 492 ERR("slave exited with code: %d", ev->exit_code);
493 else if (ev->signalled) 493 else if (ev->signalled)
494 ERR("slave exited by signal: %d\n", ev->exit_signal); 494 ERR("slave exited by signal: %d", ev->exit_signal);
495 495
496 if (!ed->processing) 496 if (!ed->processing)
497 goto end; 497 goto end;
498 498
499 i = ed->queue.current; 499 i = ed->queue.current;
500 ERR("failed to generate thumbnail for: \"%s:%s\"\n", 500 ERR("failed to generate thumbnail for: \"%s:%s\"",
501 ed->processing->file, ed->processing->key); 501 ed->processing->file, ed->processing->key);
502 502
503 if (ed->queue.table[i].used) 503 if (ed->queue.table[i].used)
@@ -559,7 +559,7 @@ _ethumbd_pipe_write_setup(struct _Ethumbd *ed, int type, const void *data)
559 case ETHUMBD_SETUP_FINISHED: 559 case ETHUMBD_SETUP_FINISHED:
560 break; 560 break;
561 default: 561 default:
562 ERR("wrong ethumb setup parameter.\n"); 562 ERR("wrong ethumb setup parameter.");
563 } 563 }
564} 564}
565 565
@@ -690,7 +690,7 @@ _process_queue_cb(void *data)
690 request = eina_list_data_get(eobject->queue); 690 request = eina_list_data_get(eobject->queue);
691 eobject->queue = eina_list_remove_list(eobject->queue, eobject->queue); 691 eobject->queue = eina_list_remove_list(eobject->queue, eobject->queue);
692 ed->queue.current = i; 692 ed->queue.current = i;
693 DBG("processing file: \"%s:%s\"...\n", request->file, 693 DBG("processing file: \"%s:%s\"...", request->file,
694 request->key); 694 request->key);
695 ed->processing = request; 695 ed->processing = request;
696 696
@@ -777,7 +777,7 @@ _ethumb_table_append(struct _Ethumbd *ed)
777 q->table[i].min_id = -1; 777 q->table[i].min_id = -1;
778 q->list[q->count] = i; 778 q->list[q->count] = i;
779 q->count++; 779 q->count++;
780 DBG("new object: %s, index = %d, count = %d\n", buf, i, q->count); 780 DBG("new object: %s, index = %d, count = %d", buf, i, q->count);
781 781
782 return i; 782 return i;
783} 783}
@@ -866,13 +866,13 @@ _name_owner_changed_cb(void *data, DBusMessage *msg)
866 DBUS_TYPE_STRING, &to, 866 DBUS_TYPE_STRING, &to,
867 DBUS_TYPE_INVALID)) 867 DBUS_TYPE_INVALID))
868 { 868 {
869 ERR("could not get NameOwnerChanged arguments: %s: %s\n", 869 ERR("could not get NameOwnerChanged arguments: %s: %s",
870 err.name, err.message); 870 err.name, err.message);
871 dbus_error_free(&err); 871 dbus_error_free(&err);
872 return; 872 return;
873 } 873 }
874 874
875 DBG("NameOwnerChanged: name = %s, from = %s, to = %s\n", name, from, to); 875 DBG("NameOwnerChanged: name = %s, from = %s, to = %s", name, from, to);
876 876
877 if (from[0] == '\0' || to[0] != '\0') 877 if (from[0] == '\0' || to[0] != '\0')
878 return; 878 return;
@@ -883,7 +883,7 @@ _name_owner_changed_cb(void *data, DBusMessage *msg)
883 if (q->table[i].used && q->table[i].client == from) 883 if (q->table[i].used && q->table[i].client == from)
884 { 884 {
885 _ethumb_table_del(ed, i); 885 _ethumb_table_del(ed, i);
886 DBG("deleting [%d] from queue table.\n", i); 886 DBG("deleting [%d] from queue table.", i);
887 } 887 }
888 } 888 }
889} 889}
@@ -927,7 +927,7 @@ _ethumb_dbus_ethumb_new_cb(E_DBus_Object *object, DBusMessage *msg)
927 dbus_object = e_dbus_object_add(ed->conn, return_path, odata); 927 dbus_object = e_dbus_object_add(ed->conn, return_path, odata);
928 if (!dbus_object) 928 if (!dbus_object)
929 { 929 {
930 ERR("could not create dbus_object.\n"); 930 ERR("could not create dbus_object.");
931 free(odata); 931 free(odata);
932 return_path = ""; 932 return_path = "";
933 goto end_new; 933 goto end_new;
@@ -964,7 +964,7 @@ _ethumb_dbus_get_bytearray(DBusMessageIter *iter)
964 el_type = dbus_message_iter_get_element_type(iter); 964 el_type = dbus_message_iter_get_element_type(iter);
965 if (el_type != DBUS_TYPE_BYTE) 965 if (el_type != DBUS_TYPE_BYTE)
966 { 966 {
967 ERR("not an byte array element.\n"); 967 ERR("not an byte array element.");
968 return NULL; 968 return NULL;
969 } 969 }
970 970
@@ -1017,14 +1017,14 @@ _ethumb_dbus_queue_add_cb(E_DBus_Object *object, DBusMessage *msg)
1017 1017
1018 if (!file) 1018 if (!file)
1019 { 1019 {
1020 ERR("no filename given.\n"); 1020 ERR("no filename given.");
1021 goto end; 1021 goto end;
1022 } 1022 }
1023 1023
1024 odata = e_dbus_object_data_get(object); 1024 odata = e_dbus_object_data_get(object);
1025 if (!odata) 1025 if (!odata)
1026 { 1026 {
1027 ERR("could not get dbus_object data.\n"); 1027 ERR("could not get dbus_object data.");
1028 goto end; 1028 goto end;
1029 } 1029 }
1030 1030
@@ -1071,7 +1071,7 @@ _ethumb_dbus_queue_remove_cb(E_DBus_Object *object, DBusMessage *msg)
1071 odata = e_dbus_object_data_get(object); 1071 odata = e_dbus_object_data_get(object);
1072 if (!odata) 1072 if (!odata)
1073 { 1073 {
1074 ERR("could not get dbus_object data.\n"); 1074 ERR("could not get dbus_object data.");
1075 goto end; 1075 goto end;
1076 } 1076 }
1077 1077
@@ -1119,7 +1119,7 @@ _ethumb_dbus_queue_clear_cb(E_DBus_Object *object, DBusMessage *msg)
1119 odata = e_dbus_object_data_get(object); 1119 odata = e_dbus_object_data_get(object);
1120 if (!odata) 1120 if (!odata)
1121 { 1121 {
1122 ERR("could not get dbus_object data.\n"); 1122 ERR("could not get dbus_object data.");
1123 goto end; 1123 goto end;
1124 } 1124 }
1125 1125
@@ -1158,7 +1158,7 @@ _ethumb_dbus_delete_cb(E_DBus_Object *object, DBusMessage *msg)
1158 odata = e_dbus_object_data_get(object); 1158 odata = e_dbus_object_data_get(object);
1159 if (!odata) 1159 if (!odata)
1160 { 1160 {
1161 ERR("could not get dbus_object data for del_cb.\n"); 1161 ERR("could not get dbus_object data for del_cb.");
1162 return reply; 1162 return reply;
1163 } 1163 }
1164 ed = odata->ed; 1164 ed = odata->ed;
@@ -1177,12 +1177,12 @@ _ethumb_dbus_fdo_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIter
1177 type = dbus_message_iter_get_arg_type(iter); 1177 type = dbus_message_iter_get_arg_type(iter);
1178 if (type != DBUS_TYPE_INT32) 1178 if (type != DBUS_TYPE_INT32)
1179 { 1179 {
1180 ERR("invalid param for fdo_set.\n"); 1180 ERR("invalid param for fdo_set.");
1181 return 0; 1181 return 0;
1182 } 1182 }
1183 1183
1184 dbus_message_iter_get_basic(iter, &fdo); 1184 dbus_message_iter_get_basic(iter, &fdo);
1185 DBG("setting fdo to: %d\n", fdo); 1185 DBG("setting fdo to: %d", fdo);
1186 1186
1187 return 1; 1187 return 1;
1188} 1188}
@@ -1197,7 +1197,7 @@ _ethumb_dbus_size_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIter
1197 type = dbus_message_iter_get_arg_type(iter); 1197 type = dbus_message_iter_get_arg_type(iter);
1198 if (type != DBUS_TYPE_STRUCT) 1198 if (type != DBUS_TYPE_STRUCT)
1199 { 1199 {
1200 ERR("invalid param for size_set.\n"); 1200 ERR("invalid param for size_set.");
1201 return 0; 1201 return 0;
1202 } 1202 }
1203 1203
@@ -1205,7 +1205,7 @@ _ethumb_dbus_size_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIter
1205 dbus_message_iter_get_basic(&oiter, &w); 1205 dbus_message_iter_get_basic(&oiter, &w);
1206 dbus_message_iter_next(&oiter); 1206 dbus_message_iter_next(&oiter);
1207 dbus_message_iter_get_basic(&oiter, &h); 1207 dbus_message_iter_get_basic(&oiter, &h);
1208 DBG("setting size to: %dx%d\n", w, h); 1208 DBG("setting size to: %dx%d", w, h);
1209 request->setup.flags.size = 1; 1209 request->setup.flags.size = 1;
1210 request->setup.tw = w; 1210 request->setup.tw = w;
1211 request->setup.th = h; 1211 request->setup.th = h;
@@ -1222,12 +1222,12 @@ _ethumb_dbus_format_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIt
1222 type = dbus_message_iter_get_arg_type(iter); 1222 type = dbus_message_iter_get_arg_type(iter);
1223 if (type != DBUS_TYPE_INT32) 1223 if (type != DBUS_TYPE_INT32)
1224 { 1224 {
1225 ERR("invalid param for format_set.\n"); 1225 ERR("invalid param for format_set.");
1226 return 0; 1226 return 0;
1227 } 1227 }
1228 1228
1229 dbus_message_iter_get_basic(iter, &format); 1229 dbus_message_iter_get_basic(iter, &format);
1230 DBG("setting format to: %d\n", format); 1230 DBG("setting format to: %d", format);
1231 request->setup.flags.format = 1; 1231 request->setup.flags.format = 1;
1232 request->setup.format = format; 1232 request->setup.format = format;
1233 1233
@@ -1243,12 +1243,12 @@ _ethumb_dbus_aspect_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIt
1243 type = dbus_message_iter_get_arg_type(iter); 1243 type = dbus_message_iter_get_arg_type(iter);
1244 if (type != DBUS_TYPE_INT32) 1244 if (type != DBUS_TYPE_INT32)
1245 { 1245 {
1246 ERR("invalid param for aspect_set.\n"); 1246 ERR("invalid param for aspect_set.");
1247 return 0; 1247 return 0;
1248 } 1248 }
1249 1249
1250 dbus_message_iter_get_basic(iter, &aspect); 1250 dbus_message_iter_get_basic(iter, &aspect);
1251 DBG("setting aspect to: %d\n", aspect); 1251 DBG("setting aspect to: %d", aspect);
1252 request->setup.flags.aspect = 1; 1252 request->setup.flags.aspect = 1;
1253 request->setup.aspect = aspect; 1253 request->setup.aspect = aspect;
1254 1254
@@ -1265,7 +1265,7 @@ _ethumb_dbus_crop_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIter
1265 type = dbus_message_iter_get_arg_type(iter); 1265 type = dbus_message_iter_get_arg_type(iter);
1266 if (type != DBUS_TYPE_STRUCT) 1266 if (type != DBUS_TYPE_STRUCT)
1267 { 1267 {
1268 ERR("invalid param for crop_set.\n"); 1268 ERR("invalid param for crop_set.");
1269 return 0; 1269 return 0;
1270 } 1270 }
1271 1271
@@ -1273,7 +1273,7 @@ _ethumb_dbus_crop_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIter
1273 dbus_message_iter_get_basic(&oiter, &x); 1273 dbus_message_iter_get_basic(&oiter, &x);
1274 dbus_message_iter_next(&oiter); 1274 dbus_message_iter_next(&oiter);
1275 dbus_message_iter_get_basic(&oiter, &y); 1275 dbus_message_iter_get_basic(&oiter, &y);
1276 DBG("setting crop to: %3.2f,%3.2f\n", x, y); 1276 DBG("setting crop to: %3.2f,%3.2f", x, y);
1277 request->setup.flags.crop = 1; 1277 request->setup.flags.crop = 1;
1278 request->setup.cx = x; 1278 request->setup.cx = x;
1279 request->setup.cy = y; 1279 request->setup.cy = y;
@@ -1290,12 +1290,12 @@ _ethumb_dbus_quality_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageI
1290 type = dbus_message_iter_get_arg_type(iter); 1290 type = dbus_message_iter_get_arg_type(iter);
1291 if (type != DBUS_TYPE_INT32) 1291 if (type != DBUS_TYPE_INT32)
1292 { 1292 {
1293 ERR("invalid param for quality_set.\n"); 1293 ERR("invalid param for quality_set.");
1294 return 0; 1294 return 0;
1295 } 1295 }
1296 1296
1297 dbus_message_iter_get_basic(iter, &quality); 1297 dbus_message_iter_get_basic(iter, &quality);
1298 DBG("setting quality to: %d\n", quality); 1298 DBG("setting quality to: %d", quality);
1299 request->setup.flags.quality = 1; 1299 request->setup.flags.quality = 1;
1300 request->setup.quality = quality; 1300 request->setup.quality = quality;
1301 1301
@@ -1312,12 +1312,12 @@ _ethumb_dbus_compress_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessage
1312 type = dbus_message_iter_get_arg_type(iter); 1312 type = dbus_message_iter_get_arg_type(iter);
1313 if (type != DBUS_TYPE_INT32) 1313 if (type != DBUS_TYPE_INT32)
1314 { 1314 {
1315 ERR("invalid param for compress_set.\n"); 1315 ERR("invalid param for compress_set.");
1316 return 0; 1316 return 0;
1317 } 1317 }
1318 1318
1319 dbus_message_iter_get_basic(iter, &compress); 1319 dbus_message_iter_get_basic(iter, &compress);
1320 DBG("setting compress to: %d\n", compress); 1320 DBG("setting compress to: %d", compress);
1321 request->setup.flags.compress = 1; 1321 request->setup.flags.compress = 1;
1322 request->setup.compress = compress; 1322 request->setup.compress = compress;
1323 1323
@@ -1334,7 +1334,7 @@ _ethumb_dbus_frame_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIte
1334 type = dbus_message_iter_get_arg_type(iter); 1334 type = dbus_message_iter_get_arg_type(iter);
1335 if (type != DBUS_TYPE_STRUCT) 1335 if (type != DBUS_TYPE_STRUCT)
1336 { 1336 {
1337 ERR("invalid param for frame_set.\n"); 1337 ERR("invalid param for frame_set.");
1338 return 0; 1338 return 0;
1339 } 1339 }
1340 1340
@@ -1344,7 +1344,7 @@ _ethumb_dbus_frame_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessageIte
1344 group = _ethumb_dbus_get_bytearray(&oiter); 1344 group = _ethumb_dbus_get_bytearray(&oiter);
1345 dbus_message_iter_next(&oiter); 1345 dbus_message_iter_next(&oiter);
1346 swallow = _ethumb_dbus_get_bytearray(&oiter); 1346 swallow = _ethumb_dbus_get_bytearray(&oiter);
1347 DBG("setting frame to \"%s:%s:%s\"\n", file, group, swallow); 1347 DBG("setting frame to \"%s:%s:%s\"", file, group, swallow);
1348 request->setup.flags.frame = 1; 1348 request->setup.flags.frame = 1;
1349 request->setup.theme_file = eina_stringshare_add(file); 1349 request->setup.theme_file = eina_stringshare_add(file);
1350 request->setup.group = eina_stringshare_add(group); 1350 request->setup.group = eina_stringshare_add(group);
@@ -1362,12 +1362,12 @@ _ethumb_dbus_directory_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessag
1362 type = dbus_message_iter_get_arg_type(iter); 1362 type = dbus_message_iter_get_arg_type(iter);
1363 if (type != DBUS_TYPE_ARRAY) 1363 if (type != DBUS_TYPE_ARRAY)
1364 { 1364 {
1365 ERR("invalid param for dir_path_set.\n"); 1365 ERR("invalid param for dir_path_set.");
1366 return 0; 1366 return 0;
1367 } 1367 }
1368 1368
1369 directory = _ethumb_dbus_get_bytearray(iter); 1369 directory = _ethumb_dbus_get_bytearray(iter);
1370 DBG("setting directory to: %s\n", directory); 1370 DBG("setting directory to: %s", directory);
1371 request->setup.flags.directory = 1; 1371 request->setup.flags.directory = 1;
1372 request->setup.directory = eina_stringshare_add(directory); 1372 request->setup.directory = eina_stringshare_add(directory);
1373 1373
@@ -1383,12 +1383,12 @@ _ethumb_dbus_category_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessage
1383 type = dbus_message_iter_get_arg_type(iter); 1383 type = dbus_message_iter_get_arg_type(iter);
1384 if (type != DBUS_TYPE_ARRAY) 1384 if (type != DBUS_TYPE_ARRAY)
1385 { 1385 {
1386 ERR("invalid param for category.\n"); 1386 ERR("invalid param for category.");
1387 return 0; 1387 return 0;
1388 } 1388 }
1389 1389
1390 category = _ethumb_dbus_get_bytearray(iter); 1390 category = _ethumb_dbus_get_bytearray(iter);
1391 DBG("setting category to: %s\n", category); 1391 DBG("setting category to: %s", category);
1392 request->setup.flags.category = 1; 1392 request->setup.flags.category = 1;
1393 request->setup.category = eina_stringshare_add(category); 1393 request->setup.category = eina_stringshare_add(category);
1394 1394
@@ -1404,12 +1404,12 @@ _ethumb_dbus_video_time_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessa
1404 type = dbus_message_iter_get_arg_type(iter); 1404 type = dbus_message_iter_get_arg_type(iter);
1405 if (type != DBUS_TYPE_DOUBLE) 1405 if (type != DBUS_TYPE_DOUBLE)
1406 { 1406 {
1407 ERR("invalid param for video_time_set.\n"); 1407 ERR("invalid param for video_time_set.");
1408 return 0; 1408 return 0;
1409 } 1409 }
1410 1410
1411 dbus_message_iter_get_basic(iter, &video_time); 1411 dbus_message_iter_get_basic(iter, &video_time);
1412 DBG("setting video_time to: %3.2f\n", video_time); 1412 DBG("setting video_time to: %3.2f", video_time);
1413 request->setup.flags.video_time = 1; 1413 request->setup.flags.video_time = 1;
1414 request->setup.video_time = video_time; 1414 request->setup.video_time = video_time;
1415 1415
@@ -1425,12 +1425,12 @@ _ethumb_dbus_video_start_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMess
1425 type = dbus_message_iter_get_arg_type(iter); 1425 type = dbus_message_iter_get_arg_type(iter);
1426 if (type != DBUS_TYPE_DOUBLE) 1426 if (type != DBUS_TYPE_DOUBLE)
1427 { 1427 {
1428 ERR("invalid param for video_start_set.\n"); 1428 ERR("invalid param for video_start_set.");
1429 return 0; 1429 return 0;
1430 } 1430 }
1431 1431
1432 dbus_message_iter_get_basic(iter, &video_start); 1432 dbus_message_iter_get_basic(iter, &video_start);
1433 DBG("setting video_start to: %3.2f\n", video_start); 1433 DBG("setting video_start to: %3.2f", video_start);
1434 request->setup.flags.video_start = 1; 1434 request->setup.flags.video_start = 1;
1435 request->setup.video_start = video_start; 1435 request->setup.video_start = video_start;
1436 1436
@@ -1446,12 +1446,12 @@ _ethumb_dbus_video_interval_set(struct _Ethumb_Object *eobject __UNUSED__, DBusM
1446 type = dbus_message_iter_get_arg_type(iter); 1446 type = dbus_message_iter_get_arg_type(iter);
1447 if (type != DBUS_TYPE_DOUBLE) 1447 if (type != DBUS_TYPE_DOUBLE)
1448 { 1448 {
1449 ERR("invalid param for video_interval_set.\n"); 1449 ERR("invalid param for video_interval_set.");
1450 return 0; 1450 return 0;
1451 } 1451 }
1452 1452
1453 dbus_message_iter_get_basic(iter, &video_interval); 1453 dbus_message_iter_get_basic(iter, &video_interval);
1454 DBG("setting video_interval to: %3.2f\n", video_interval); 1454 DBG("setting video_interval to: %3.2f", video_interval);
1455 request->setup.flags.video_interval = 1; 1455 request->setup.flags.video_interval = 1;
1456 request->setup.video_interval = video_interval; 1456 request->setup.video_interval = video_interval;
1457 1457
@@ -1467,12 +1467,12 @@ _ethumb_dbus_video_ntimes_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMes
1467 type = dbus_message_iter_get_arg_type(iter); 1467 type = dbus_message_iter_get_arg_type(iter);
1468 if (type != DBUS_TYPE_UINT32) 1468 if (type != DBUS_TYPE_UINT32)
1469 { 1469 {
1470 ERR("invalid param for video_ntimes_set.\n"); 1470 ERR("invalid param for video_ntimes_set.");
1471 return 0; 1471 return 0;
1472 } 1472 }
1473 1473
1474 dbus_message_iter_get_basic(iter, &video_ntimes); 1474 dbus_message_iter_get_basic(iter, &video_ntimes);
1475 DBG("setting video_ntimes to: %3.2d\n", video_ntimes); 1475 DBG("setting video_ntimes to: %3.2d", video_ntimes);
1476 request->setup.flags.video_ntimes = 1; 1476 request->setup.flags.video_ntimes = 1;
1477 request->setup.video_ntimes = video_ntimes; 1477 request->setup.video_ntimes = video_ntimes;
1478 1478
@@ -1488,12 +1488,12 @@ _ethumb_dbus_video_fps_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMessag
1488 type = dbus_message_iter_get_arg_type(iter); 1488 type = dbus_message_iter_get_arg_type(iter);
1489 if (type != DBUS_TYPE_UINT32) 1489 if (type != DBUS_TYPE_UINT32)
1490 { 1490 {
1491 ERR("invalid param for video_fps_set.\n"); 1491 ERR("invalid param for video_fps_set.");
1492 return 0; 1492 return 0;
1493 } 1493 }
1494 1494
1495 dbus_message_iter_get_basic(iter, &video_fps); 1495 dbus_message_iter_get_basic(iter, &video_fps);
1496 DBG("setting video_fps to: %3.2d\n", video_fps); 1496 DBG("setting video_fps to: %3.2d", video_fps);
1497 request->setup.flags.video_fps = 1; 1497 request->setup.flags.video_fps = 1;
1498 request->setup.video_fps = video_fps; 1498 request->setup.video_fps = video_fps;
1499 1499
@@ -1509,12 +1509,12 @@ _ethumb_dbus_document_page_set(struct _Ethumb_Object *eobject __UNUSED__, DBusMe
1509 type = dbus_message_iter_get_arg_type(iter); 1509 type = dbus_message_iter_get_arg_type(iter);
1510 if (type != DBUS_TYPE_UINT32) 1510 if (type != DBUS_TYPE_UINT32)
1511 { 1511 {
1512 ERR("invalid param for document_page_set.\n"); 1512 ERR("invalid param for document_page_set.");
1513 return 0; 1513 return 0;
1514 } 1514 }
1515 1515
1516 dbus_message_iter_get_basic(iter, &document_page); 1516 dbus_message_iter_get_basic(iter, &document_page);
1517 DBG("setting document_page to: %d\n", document_page); 1517 DBG("setting document_page to: %d", document_page);
1518 request->setup.flags.document_page = 1; 1518 request->setup.flags.document_page = 1;
1519 request->setup.document_page = document_page; 1519 request->setup.document_page = document_page;
1520 1520
@@ -1566,7 +1566,7 @@ _ethumb_dbus_ethumb_setup_parse_element(struct _Ethumb_Object *eobject, DBusMess
1566 1566
1567 if (!r) 1567 if (!r)
1568 { 1568 {
1569 ERR("ethumb_setup invalid option: %s\n", option); 1569 ERR("ethumb_setup invalid option: %s", option);
1570 return 0; 1570 return 0;
1571 } 1571 }
1572 1572
@@ -1589,14 +1589,14 @@ _ethumb_dbus_ethumb_setup_cb(E_DBus_Object *object, DBusMessage *msg)
1589 dbus_message_iter_init(msg, &iter); 1589 dbus_message_iter_init(msg, &iter);
1590 if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) 1590 if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
1591 { 1591 {
1592 ERR("wrong parameters.\n"); 1592 ERR("wrong parameters.");
1593 goto end; 1593 goto end;
1594 } 1594 }
1595 1595
1596 odata = e_dbus_object_data_get(object); 1596 odata = e_dbus_object_data_get(object);
1597 if (!odata) 1597 if (!odata)
1598 { 1598 {
1599 ERR("could not get dbus_object data for setup_cb.\n"); 1599 ERR("could not get dbus_object data for setup_cb.");
1600 goto end; 1600 goto end;
1601 } 1601 }
1602 1602
@@ -1701,7 +1701,7 @@ _ethumb_dbus_request_name_cb(void *data, DBusMessage *msg __UNUSED__, DBusError
1701 1701
1702 if (dbus_error_is_set(err)) 1702 if (dbus_error_is_set(err))
1703 { 1703 {
1704 ERR("request name error: %s\n", err->message); 1704 ERR("request name error: %s", err->message);
1705 dbus_error_free(err); 1705 dbus_error_free(err);
1706 e_dbus_connection_close(ed->conn); 1706 e_dbus_connection_close(ed->conn);
1707 return; 1707 return;
@@ -1714,14 +1714,14 @@ _ethumb_dbus_request_name_cb(void *data, DBusMessage *msg __UNUSED__, DBusError
1714 ed->eiface = e_dbus_interface_new(_ethumb_dbus_interface); 1714 ed->eiface = e_dbus_interface_new(_ethumb_dbus_interface);
1715 if (!ed->eiface) 1715 if (!ed->eiface)
1716 { 1716 {
1717 ERR("could not create interface.\n"); 1717 ERR("could not create interface.");
1718 return; 1718 return;
1719 } 1719 }
1720 r = _ethumb_dbus_interface_elements_add(ed->eiface, 1720 r = _ethumb_dbus_interface_elements_add(ed->eiface,
1721 _ethumb_dbus_methods, NULL); 1721 _ethumb_dbus_methods, NULL);
1722 if (!r) 1722 if (!r)
1723 { 1723 {
1724 ERR("could not add methods to the interface.\n"); 1724 ERR("could not add methods to the interface.");
1725 e_dbus_interface_unref(ed->eiface); 1725 e_dbus_interface_unref(ed->eiface);
1726 return; 1726 return;
1727 } 1727 }
@@ -1730,7 +1730,7 @@ _ethumb_dbus_request_name_cb(void *data, DBusMessage *msg __UNUSED__, DBusError
1730 ed->objects_iface = e_dbus_interface_new(_ethumb_dbus_objects_interface); 1730 ed->objects_iface = e_dbus_interface_new(_ethumb_dbus_objects_interface);
1731 if (!ed->objects_iface) 1731 if (!ed->objects_iface)
1732 { 1732 {
1733 ERR("could not create interface.\n"); 1733 ERR("could not create interface.");
1734 return; 1734 return;
1735 } 1735 }
1736 1736
@@ -1739,7 +1739,7 @@ _ethumb_dbus_request_name_cb(void *data, DBusMessage *msg __UNUSED__, DBusError
1739 _ethumb_dbus_objects_signals); 1739 _ethumb_dbus_objects_signals);
1740 if (!r) 1740 if (!r)
1741 { 1741 {
1742 ERR("ERROR: could not setup objects interface methods.\n"); 1742 ERR("ERROR: could not setup objects interface methods.");
1743 e_dbus_interface_unref(ed->objects_iface); 1743 e_dbus_interface_unref(ed->objects_iface);
1744 return; 1744 return;
1745 } 1745 }
@@ -1787,7 +1787,7 @@ _ethumbd_slave_spawn(struct _Ethumbd *ed)
1787 ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_WRITE, ed); 1787 ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_WRITE, ed);
1788 if (!ed->slave.exe) 1788 if (!ed->slave.exe)
1789 { 1789 {
1790 ERR("could not create slave.\n"); 1790 ERR("could not create slave.");
1791 return 0; 1791 return 0;
1792 } 1792 }
1793 1793
@@ -1825,7 +1825,7 @@ main(int argc, char *argv[])
1825 1825
1826 if (!e_dbus_init()) 1826 if (!e_dbus_init())
1827 { 1827 {
1828 ERR("could not init e_dbus.\n"); 1828 ERR("could not init e_dbus.");
1829 exit_value = -1; 1829 exit_value = -1;
1830 goto finish; 1830 goto finish;
1831 } 1831 }
@@ -1842,7 +1842,7 @@ main(int argc, char *argv[])
1842 arg_index = ecore_getopt_parse(&optdesc, values, argc, argv); 1842 arg_index = ecore_getopt_parse(&optdesc, values, argc, argv);
1843 if (arg_index < 0) 1843 if (arg_index < 0)
1844 { 1844 {
1845 ERR("Could not parse arguments.\n"); 1845 ERR("Could not parse arguments.");
1846 exit_value = -2; 1846 exit_value = -2;
1847 goto finish; 1847 goto finish;
1848 } 1848 }
@@ -1853,7 +1853,7 @@ main(int argc, char *argv[])
1853 ed.conn = e_dbus_bus_get(DBUS_BUS_SESSION); 1853 ed.conn = e_dbus_bus_get(DBUS_BUS_SESSION);
1854 if (!ed.conn) 1854 if (!ed.conn)
1855 { 1855 {
1856 ERR("could not connect to session bus.\n"); 1856 ERR("could not connect to session bus.");
1857 exit_value = -3; 1857 exit_value = -3;
1858 goto finish_edbus; 1858 goto finish_edbus;
1859 } 1859 }
@@ -1863,7 +1863,7 @@ main(int argc, char *argv[])
1863 if (!_ethumb_dbus_setup(&ed)) 1863 if (!_ethumb_dbus_setup(&ed))
1864 { 1864 {
1865 e_dbus_connection_close(ed.conn); 1865 e_dbus_connection_close(ed.conn);
1866 ERR("could not setup dbus connection.\n"); 1866 ERR("could not setup dbus connection.");
1867 exit_value = -5; 1867 exit_value = -5;
1868 goto finish_edbus; 1868 goto finish_edbus;
1869 } 1869 }
diff --git a/legacy/ethumb/src/bin/ethumbd_child.c b/legacy/ethumb/src/bin/ethumbd_child.c
index 59f7c0d24e..98e2e8bc15 100644
--- a/legacy/ethumb/src/bin/ethumbd_child.c
+++ b/legacy/ethumb/src/bin/ethumbd_child.c
@@ -189,7 +189,7 @@ _ec_op_new(struct _Ethumbd_Child *ec)
189 if (!r) 189 if (!r)
190 return 0; 190 return 0;
191 191
192 DBG("ethumbd new(). index = %d\n", index); 192 DBG("ethumbd new(). index = %d", index);
193 193
194 ec->ethumbt[index] = ethumb_new(); 194 ec->ethumbt[index] = ethumb_new();
195 return 1; 195 return 1;
@@ -205,7 +205,7 @@ _ec_op_del(struct _Ethumbd_Child *ec)
205 if (!r) 205 if (!r)
206 return 0; 206 return 0;
207 207
208 DBG("ethumbd del(). index = %d\n", index); 208 DBG("ethumbd del(). index = %d", index);
209 209
210 ethumb_free(ec->ethumbt[index]); 210 ethumb_free(ec->ethumbt[index]);
211 ec->ethumbt[index] = NULL; 211 ec->ethumbt[index] = NULL;
@@ -218,8 +218,8 @@ _ec_op_generated_cb(void *data, Ethumb *e, Eina_Bool success)
218 const char *thumb_path, *thumb_key; 218 const char *thumb_path, *thumb_key;
219 int size_path, size_key, size_cmd; 219 int size_path, size_key, size_cmd;
220 220
221 fprintf(stderr, "thumbnail generated!\n"); 221 fprintf(stderr, "thumbnail generated!");
222 DBG("thumb generated!\n"); 222 DBG("thumb generated!");
223 ethumb_thumb_path_get(e, &thumb_path, &thumb_key); 223 ethumb_thumb_path_get(e, &thumb_path, &thumb_key);
224 224
225 if (!thumb_path) 225 if (!thumb_path)
@@ -291,7 +291,7 @@ _ec_fdo_set(struct _Ethumbd_Child *ec, Ethumb *e)
291 if (!r) 291 if (!r)
292 return 0; 292 return 0;
293 ethumb_thumb_fdo_set(e, value); 293 ethumb_thumb_fdo_set(e, value);
294 DBG("fdo = %d\n", value); 294 DBG("fdo = %d", value);
295 295
296 return 1; 296 return 1;
297} 297}
@@ -313,7 +313,7 @@ _ec_size_set(struct _Ethumbd_Child *ec, Ethumb *e)
313 if (!r) 313 if (!r)
314 return 0; 314 return 0;
315 ethumb_thumb_size_set(e, w, h); 315 ethumb_thumb_size_set(e, w, h);
316 DBG("size = %dx%d\n", w, h); 316 DBG("size = %dx%d", w, h);
317 317
318 return 1; 318 return 1;
319} 319}
@@ -328,7 +328,7 @@ _ec_format_set(struct _Ethumbd_Child *ec, Ethumb *e)
328 if (!r) 328 if (!r)
329 return 0; 329 return 0;
330 ethumb_thumb_format_set(e, value); 330 ethumb_thumb_format_set(e, value);
331 DBG("format = %d\n", value); 331 DBG("format = %d", value);
332 332
333 return 1; 333 return 1;
334} 334}
@@ -343,7 +343,7 @@ _ec_aspect_set(struct _Ethumbd_Child *ec, Ethumb *e)
343 if (!r) 343 if (!r)
344 return 0; 344 return 0;
345 ethumb_thumb_aspect_set(e, value); 345 ethumb_thumb_aspect_set(e, value);
346 DBG("aspect = %d\n", value); 346 DBG("aspect = %d", value);
347 347
348 return 1; 348 return 1;
349} 349}
@@ -365,7 +365,7 @@ _ec_crop_set(struct _Ethumbd_Child *ec, Ethumb *e)
365 if (!r) 365 if (!r)
366 return 0; 366 return 0;
367 ethumb_thumb_crop_align_set(e, x, y); 367 ethumb_thumb_crop_align_set(e, x, y);
368 DBG("crop = %fx%f\n", x, y); 368 DBG("crop = %fx%f", x, y);
369 369
370 return 1; 370 return 1;
371} 371}
@@ -380,7 +380,7 @@ _ec_quality_set(struct _Ethumbd_Child *ec, Ethumb *e)
380 if (!r) 380 if (!r)
381 return 0; 381 return 0;
382 ethumb_thumb_quality_set(e, value); 382 ethumb_thumb_quality_set(e, value);
383 DBG("quality = %d\n", value); 383 DBG("quality = %d", value);
384 384
385 return 1; 385 return 1;
386} 386}
@@ -395,7 +395,7 @@ _ec_compress_set(struct _Ethumbd_Child *ec, Ethumb *e)
395 if (!r) 395 if (!r)
396 return 0; 396 return 0;
397 ethumb_thumb_compress_set(e, value); 397 ethumb_thumb_compress_set(e, value);
398 DBG("compress = %d\n", value); 398 DBG("compress = %d", value);
399 399
400 return 1; 400 return 1;
401} 401}
@@ -422,7 +422,7 @@ _ec_frame_set(struct _Ethumbd_Child *ec, Ethumb *e)
422 r = _ec_pipe_str_read(ec, &swallow); 422 r = _ec_pipe_str_read(ec, &swallow);
423 if (!r) 423 if (!r)
424 return 0; 424 return 0;
425 DBG("frame = %s:%s:%s\n", theme_file, group, swallow); 425 DBG("frame = %s:%s:%s", theme_file, group, swallow);
426 ethumb_frame_set(e, theme_file, group, swallow); 426 ethumb_frame_set(e, theme_file, group, swallow);
427 free(theme_file); 427 free(theme_file);
428 free(group); 428 free(group);
@@ -441,7 +441,7 @@ _ec_directory_set(struct _Ethumbd_Child *ec, Ethumb *e)
441 if (!r) 441 if (!r)
442 return 0; 442 return 0;
443 ethumb_thumb_dir_path_set(e, directory); 443 ethumb_thumb_dir_path_set(e, directory);
444 DBG("directory = %s\n", directory); 444 DBG("directory = %s", directory);
445 free(directory); 445 free(directory);
446 446
447 return 1; 447 return 1;
@@ -457,7 +457,7 @@ _ec_category_set(struct _Ethumbd_Child *ec, Ethumb *e)
457 if (!r) 457 if (!r)
458 return 0; 458 return 0;
459 ethumb_thumb_category_set(e, category); 459 ethumb_thumb_category_set(e, category);
460 DBG("category = %s\n", category); 460 DBG("category = %s", category);
461 free(category); 461 free(category);
462 462
463 return 1; 463 return 1;
@@ -473,7 +473,7 @@ _ec_video_time_set(struct _Ethumbd_Child *ec, Ethumb *e)
473 if (!r) 473 if (!r)
474 return 0; 474 return 0;
475 ethumb_video_time_set(e, value); 475 ethumb_video_time_set(e, value);
476 DBG("video_time = %f\n", value); 476 DBG("video_time = %f", value);
477 477
478 return 1; 478 return 1;
479} 479}
@@ -488,7 +488,7 @@ _ec_video_start_set(struct _Ethumbd_Child *ec, Ethumb *e)
488 if (!r) 488 if (!r)
489 return 0; 489 return 0;
490 ethumb_video_start_set(e, value); 490 ethumb_video_start_set(e, value);
491 DBG("video_start = %f\n", value); 491 DBG("video_start = %f", value);
492 492
493 return 1; 493 return 1;
494} 494}
@@ -503,7 +503,7 @@ _ec_video_interval_set(struct _Ethumbd_Child *ec, Ethumb *e)
503 if (!r) 503 if (!r)
504 return 0; 504 return 0;
505 ethumb_video_interval_set(e, value); 505 ethumb_video_interval_set(e, value);
506 DBG("video_interval = %f\n", value); 506 DBG("video_interval = %f", value);
507 507
508 return 1; 508 return 1;
509} 509}
@@ -518,7 +518,7 @@ _ec_video_ntimes_set(struct _Ethumbd_Child *ec, Ethumb *e)
518 if (!r) 518 if (!r)
519 return 0; 519 return 0;
520 ethumb_video_ntimes_set(e, value); 520 ethumb_video_ntimes_set(e, value);
521 DBG("video_ntimes = %d\n", value); 521 DBG("video_ntimes = %d", value);
522 522
523 return 1; 523 return 1;
524} 524}
@@ -533,7 +533,7 @@ _ec_video_fps_set(struct _Ethumbd_Child *ec, Ethumb *e)
533 if (!r) 533 if (!r)
534 return 0; 534 return 0;
535 ethumb_video_fps_set(e, value); 535 ethumb_video_fps_set(e, value);
536 DBG("video_fps = %d\n", value); 536 DBG("video_fps = %d", value);
537 537
538 return 1; 538 return 1;
539} 539}
@@ -548,7 +548,7 @@ _ec_document_page_set(struct _Ethumbd_Child *ec, Ethumb *e)
548 if (!r) 548 if (!r)
549 return 0; 549 return 0;
550 ethumb_document_page_set(e, value); 550 ethumb_document_page_set(e, value);
551 DBG("document_page = %d\n", value); 551 DBG("document_page = %d", value);
552 552
553 return 1; 553 return 1;
554} 554}
@@ -611,7 +611,7 @@ _ec_setup_process(struct _Ethumbd_Child *ec, int index, int type)
611 _ec_document_page_set(ec, e); 611 _ec_document_page_set(ec, e);
612 break; 612 break;
613 default: 613 default:
614 ERR("wrong type!\n"); 614 ERR("wrong type!");
615 } 615 }
616} 616}
617 617
@@ -649,7 +649,7 @@ _ec_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
649 649
650 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR)) 650 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
651 { 651 {
652 ERR("error on pipein! child exiting...\n"); 652 ERR("error on pipein! child exiting...");
653 ec->fd_handler = NULL; 653 ec->fd_handler = NULL;
654 ecore_main_loop_quit(); 654 ecore_main_loop_quit();
655 return 0; 655 return 0;
@@ -658,13 +658,13 @@ _ec_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
658 r = _ec_read_safe(STDIN_FILENO, &op_id, sizeof(op_id)); 658 r = _ec_read_safe(STDIN_FILENO, &op_id, sizeof(op_id));
659 if (!r) 659 if (!r)
660 { 660 {
661 DBG("ethumbd exited! child exiting...\n"); 661 DBG("ethumbd exited! child exiting...");
662 ec->fd_handler = NULL; 662 ec->fd_handler = NULL;
663 ecore_main_loop_quit(); 663 ecore_main_loop_quit();
664 return 0; 664 return 0;
665 } 665 }
666 666
667 DBG("received op: %d\n", op_id); 667 DBG("received op: %d", op_id);
668 668
669 switch (op_id) 669 switch (op_id)
670 { 670 {
@@ -681,13 +681,13 @@ _ec_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
681 r = _ec_op_del(ec); 681 r = _ec_op_del(ec);
682 break; 682 break;
683 default: 683 default:
684 ERR("invalid operation: %d\n", op_id); 684 ERR("invalid operation: %d", op_id);
685 r = 0; 685 r = 0;
686 } 686 }
687 687
688 if (!r) 688 if (!r)
689 { 689 {
690 ERR("ethumbd exited! child exiting...\n"); 690 ERR("ethumbd exited! child exiting...");
691 ec->fd_handler = NULL; 691 ec->fd_handler = NULL;
692 ecore_main_loop_quit(); 692 ecore_main_loop_quit();
693 } 693 }
@@ -714,9 +714,9 @@ main(int argc, const char *argv[])
714 714
715 _ec_setup(ec); 715 _ec_setup(ec);
716 716
717 DBG("child started!\n"); 717 DBG("child started!");
718 ecore_main_loop_begin(); 718 ecore_main_loop_begin();
719 DBG("child finishing.\n"); 719 DBG("child finishing.");
720 720
721 _ec_free(ec); 721 _ec_free(ec);
722 722