From c97f25128bacf5cbde838b9aca8833b6aae7fe4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Mon, 7 May 2012 17:22:06 +0000 Subject: [PATCH] cserve2 warnings begone SVN revision: 70845 --- legacy/evas/src/bin/evas_cserve2_client.c | 2 +- legacy/evas/src/bin/evas_cserve2_messages.c | 4 ++++ legacy/evas/src/bin/evas_cserve2_slaves.c | 1 - legacy/evas/src/lib/canvas/evas_render.c | 3 +++ legacy/evas/src/lib/cserve2/evas_cs2_client.c | 3 +-- legacy/evas/src/modules/engines/buffer/evas_outbuf.c | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/legacy/evas/src/bin/evas_cserve2_client.c b/legacy/evas/src/bin/evas_cserve2_client.c index 9863dc8f5a..ab5093248f 100644 --- a/legacy/evas/src/bin/evas_cserve2_client.c +++ b/legacy/evas/src/bin/evas_cserve2_client.c @@ -403,7 +403,7 @@ int main(void) if ((t=recv(s, &size, sizeof(size), MSG_DONTWAIT)) > 0) { - int len = recv(s, msgbuf, size, 0); + len = recv(s, msgbuf, size, 0); printf("size of received message: %d\n", len); if (len != size) { diff --git a/legacy/evas/src/bin/evas_cserve2_messages.c b/legacy/evas/src/bin/evas_cserve2_messages.c index 51868969dd..14a2bec144 100644 --- a/legacy/evas/src/bin/evas_cserve2_messages.c +++ b/legacy/evas/src/bin/evas_cserve2_messages.c @@ -21,6 +21,10 @@ debug_msg(const char *typestr, const void *buf, int size) printf("%x ", str[i]); printf("\n"); +#else + (void)typestr; + (void)buf; + (void)size; #endif } diff --git a/legacy/evas/src/bin/evas_cserve2_slaves.c b/legacy/evas/src/bin/evas_cserve2_slaves.c index 452df0d13e..f82593d4b9 100644 --- a/legacy/evas/src/bin/evas_cserve2_slaves.c +++ b/legacy/evas/src/bin/evas_cserve2_slaves.c @@ -227,7 +227,6 @@ static const char * _slave_path_get(const char *name) { char buf[PATH_MAX], cwd[PATH_MAX]; - struct stat st; if (name[0] == '/') { diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c index f9c7f3315c..e902a0af71 100644 --- a/legacy/evas/src/lib/canvas/evas_render.c +++ b/legacy/evas/src/lib/canvas/evas_render.c @@ -1,6 +1,9 @@ #include "evas_common.h" #include "evas_private.h" #include +#ifdef EVAS_CSERVE2 +#include "evas_cs2_private.h" +#endif // debug rendering /* #define REND_DGB 1 */ diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_client.c b/legacy/evas/src/lib/cserve2/evas_cs2_client.c index adc582a8b8..3f6ef4bca3 100644 --- a/legacy/evas/src/lib/cserve2/evas_cs2_client.c +++ b/legacy/evas/src/lib/cserve2/evas_cs2_client.c @@ -367,7 +367,6 @@ static void _image_preloaded_cb(void *data, const void *msg_received) { const Msg_Base *answer = msg_received; - const Msg_Opened *msg = msg_received; Image_Entry *ie = data; Data_Entry *dentry = ie->data2; @@ -433,7 +432,7 @@ _build_absolute_path(const char *path, char buf[], int size) } static unsigned int -_image_open_server_send(Image_Entry *ie, const char *file, const char *key, RGBA_Image_Loadopts *lopt) +_image_open_server_send(Image_Entry *ie, const char *file, const char *key, RGBA_Image_Loadopts *lopt __UNUSED__) { int flen, klen; int size; diff --git a/legacy/evas/src/modules/engines/buffer/evas_outbuf.c b/legacy/evas/src/modules/engines/buffer/evas_outbuf.c index 7b79ebb263..fc1ffba937 100644 --- a/legacy/evas/src/modules/engines/buffer/evas_outbuf.c +++ b/legacy/evas/src/modules/engines/buffer/evas_outbuf.c @@ -159,7 +159,7 @@ evas_buffer_outbuf_buf_switch_buffer(Outbuf *buf) if (evas_cserve2_use_get()) { evas_cache2_image_close(&buf->priv.back_buf->cache_entry); - buf->priv.back_buf = (RGBA_Image *) evas_cache2_image_data(evas_common_image_cache_get(), + buf->priv.back_buf = (RGBA_Image *) evas_cache2_image_data(evas_common_image_cache2_get(), buf->w, buf->h, buf->dest, buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888 ? 1 : 0,