summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorIván Briano <sachieru@gmail.com>2010-07-01 19:54:47 +0000
committerIván Briano <sachieru@gmail.com>2010-07-01 19:54:47 +0000
commitb9d2cf0983b0a6a7c724d9f6aff3a562f5c12546 (patch)
treedbb9fa0f313d14fd262b25249daa645c0f94396c /legacy/ethumb
parent8e50bcb41b0a77893da0af8fc6339f70120bc44b (diff)
Fix nasty cenourette.
Also from Raphael Kubo, you can ask him what the commit message means (rakuco around the irc plane of existence) SVN revision: 49976
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/src/bin/ethumbd.c13
-rw-r--r--legacy/ethumb/src/bin/ethumbd_child.c1
2 files changed, 8 insertions, 6 deletions
diff --git a/legacy/ethumb/src/bin/ethumbd.c b/legacy/ethumb/src/bin/ethumbd.c
index 31cc593bad..6e29b4d869 100644
--- a/legacy/ethumb/src/bin/ethumbd.c
+++ b/legacy/ethumb/src/bin/ethumbd.c
@@ -384,10 +384,10 @@ _ethumbd_slave_cmd_ready(struct _Ethumbd *ed)
384{ 384{
385 char *bufcmd = ed->slave.bufcmd; 385 char *bufcmd = ed->slave.bufcmd;
386 Eina_Bool *success; 386 Eina_Bool *success;
387 char *thumb_path, *thumb_key; 387 const char *thumb_path = NULL;
388 const char *thumb_key = NULL;
388 int *size_path, *size_key; 389 int *size_path, *size_key;
389 390
390
391 success = (Eina_Bool *)bufcmd; 391 success = (Eina_Bool *)bufcmd;
392 bufcmd += sizeof(*success); 392 bufcmd += sizeof(*success);
393 393
@@ -396,13 +396,16 @@ _ethumbd_slave_cmd_ready(struct _Ethumbd *ed)
396 396
397 _write_safe(STDERR_FILENO, bufcmd, ed->slave.scmd); 397 _write_safe(STDERR_FILENO, bufcmd, ed->slave.scmd);
398 398
399 thumb_path = bufcmd; 399 if (*size_path)
400 bufcmd += *size_path; 400 {
401 thumb_path = bufcmd;
402 bufcmd += *size_path;
403 }
401 404
402 size_key = (int *)bufcmd; 405 size_key = (int *)bufcmd;
403 bufcmd += sizeof(*size_key); 406 bufcmd += sizeof(*size_key);
404 407
405 thumb_key = bufcmd; 408 if (*size_key) thumb_key = bufcmd;
406 409
407 _generated_cb(ed, *success, thumb_path, thumb_key); 410 _generated_cb(ed, *success, thumb_path, thumb_key);
408 411
diff --git a/legacy/ethumb/src/bin/ethumbd_child.c b/legacy/ethumb/src/bin/ethumbd_child.c
index 9aa660cd82..3f84efdeb2 100644
--- a/legacy/ethumb/src/bin/ethumbd_child.c
+++ b/legacy/ethumb/src/bin/ethumbd_child.c
@@ -220,7 +220,6 @@ _ec_op_generated_cb(void *data, Ethumb *e, Eina_Bool success)
220 const char *thumb_path, *thumb_key; 220 const char *thumb_path, *thumb_key;
221 int size_path, size_key, size_cmd; 221 int size_path, size_key, size_cmd;
222 222
223 fprintf(stderr, "thumbnail generated!");
224 DBG("thumb generated!"); 223 DBG("thumb generated!");
225 ethumb_thumb_path_get(e, &thumb_path, &thumb_key); 224 ethumb_thumb_path_get(e, &thumb_path, &thumb_key);
226 225