fix wrns.. and fix macro!

SVN revision: 42617
This commit is contained in:
Carsten Haitzler 2009-09-22 08:04:57 +00:00
parent 85c9ee14e1
commit bea22f22a4
1 changed files with 9 additions and 4 deletions

View File

@ -25,6 +25,11 @@
#undef DBG #undef DBG
#endif #endif
#define DBG(...) EINA_LOG_DOM_DBG(_evas_cserve_bin_log_dom, __VA_ARGS__) #define DBG(...) EINA_LOG_DOM_DBG(_evas_cserve_bin_log_dom, __VA_ARGS__)
#ifdef WRN
#undef WRN
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_cserve_bin_log_dom, __VA_ARGS__)
#ifdef CSERVE_BIN_DEFAULT_COLOR #ifdef CSERVE_BIN_DEFAULT_COLOR
#undef CSERVE_BIN_DEFAULT_COLOR #undef CSERVE_BIN_DEFAULT_COLOR
#endif #endif
@ -988,8 +993,8 @@ message(void *fdata, Server *s, Client *c, int opcode, int size, unsigned char *
lopt.region.w = rep->lopt.region.w; lopt.region.w = rep->lopt.region.w;
lopt.region.h = rep->lopt.region.h; lopt.region.h = rep->lopt.region.h;
DBG("... img_load '%s'", file); DBG("... img_load '%s'", file);
if (key) DBG("'%s'", key); if (key) DBG("'%s'", (char *)key);
else DBG(" '%s'", NULL); else DBG(" '%s'", "");
DBG(" lopt { %i %1.1f %i %i { %i %i %i %i}}", DBG(" lopt { %i %1.1f %i %i { %i %i %i %i}}",
lopt.scale_down_by, lopt.dpi, lopt.w, lopt.h, lopt.scale_down_by, lopt.dpi, lopt.w, lopt.h,
lopt.region.x, lopt.region.y, lopt.region.w, lopt.region.h); lopt.region.x, lopt.region.y, lopt.region.w, lopt.region.h);
@ -1373,7 +1378,7 @@ message(void *fdata, Server *s, Client *c, int opcode, int size, unsigned char *
msg->cached.mem_total = msg->cached.mem_total =
(msg->cached.mem_total + 1023) / 1024; (msg->cached.mem_total + 1023) / 1024;
DBG("... reply"); DBG("... reply");
evas_cserve_client_send(c, OP_GETINFO, len, msg); evas_cserve_client_send(c, OP_GETINFO, len, (unsigned char *)msg);
free(msg); free(msg);
} }
else else
@ -1590,7 +1595,7 @@ main(int argc, char **argv)
} }
if ((t_next <= 0) && (cache_item_timeout_check > 0)) if ((t_next <= 0) && (cache_item_timeout_check > 0))
t_next = 1; t_next = 1;
DBG("sleep for %isec...", t_next); DBG("sleep for %isec...", (int)t_next);
LKL(strshr_freeme_lock); LKL(strshr_freeme_lock);
if (strshr_freeme_count > 0) if (strshr_freeme_count > 0)