From caa810894e82e318d7457f407606cde0909fcc38 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Mon, 27 Oct 2008 07:33:59 +0000 Subject: [PATCH] Fix print formatting SVN revision: 37205 --- src/bin/e_fm.c | 12 ++++++------ src/bin/e_fm_main.c | 2 +- src/bin/e_fm_op.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index cb37026eb..64a042da0 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -2126,18 +2126,18 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) break; case E_FM_OP_ERROR:/*error*/ - printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data); + printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data); _e_fm_error_dialog(e->ref, e->data); break; case E_FM_OP_ERROR_RETRY_ABORT:/*error*/ - printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data); - _e_fm_retry_abort_dialog(e->ref, e->data); + printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data); + _e_fm_retry_abort_dialog(e->ref, (char *)e->data); break; case E_FM_OP_OVERWRITE:/*overwrite*/ - printf("%s:%s(%d) Overwrite from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data); - _e_fm_overwrite_dialog(e->ref, e->data); + printf("%s:%s(%d) Overwrite from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data); + _e_fm_overwrite_dialog(e->ref, (char *)e->data); break; case E_FM_OP_PROGRESS:/*progress*/ @@ -2158,7 +2158,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) #undef UP src = p; dst = p + strlen(src) + 1; - printf("%s:%s(%d) Progress from slave #%d:\n\t%d%% done,\n\t%d seconds left,\n\t%lu done,\n\t%lu total,\n\tsrc = %s,\n\tdst = %s.\n", __FILE__, __FUNCTION__, __LINE__, e->ref, percent, seconds, done, total, src, dst); + printf("%s:%s(%d) Progress from slave #%d:\n\t%d%% done,\n\t%d seconds left,\n\t%d done,\n\t%d total,\n\tsrc = %s,\n\tdst = %s.\n", __FILE__, __FUNCTION__, __LINE__, e->ref, percent, seconds, done, total, src, dst); } break; diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c index 338798546..efa6ed9b2 100644 --- a/src/bin/e_fm_main.c +++ b/src/bin/e_fm_main.c @@ -1653,7 +1653,7 @@ static int _e_fm_slave_error_cb(void *data, int type, void *event) slave = ecore_exe_data_get(e->exe); - printf("EFM: Data from STDERR of slave #%d: %.*s", slave->id, e->size, e->data); + printf("EFM: Data from STDERR of slave #%d: %.*s", slave->id, e->size, (char *)e->data); return 1; } diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c index 58df6bca6..da490362c 100644 --- a/src/bin/e_fm_op.c +++ b/src/bin/e_fm_op.c @@ -833,7 +833,7 @@ _e_fm_op_send_error(E_Fm_Op_Task * task, E_Fm_Op_Type type, const char *fmt, ... write(STDOUT_FILENO, buf, 3*sizeof(int) + len + 1); - E_FM_OP_DEBUG(str); + E_FM_OP_DEBUG("%s", str); E_FM_OP_DEBUG(" Error sent.\n"); }