From e5046c88465d2590bae38d831b0a8fd152557a64 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 22 Oct 2009 22:22:10 +0000 Subject: [PATCH] Fix some warnings. I don't touch map code for now. SVN revision: 43218 --- legacy/evas/src/lib/cache/evas_cache_image.c | 3 +-- legacy/evas/src/lib/canvas/evas_object_textblock.c | 1 - legacy/evas/src/lib/canvas/evas_stats.c | 3 +-- legacy/evas/src/lib/cserve/evas_cs_client.c | 2 +- legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c | 2 +- legacy/evas/src/lib/engines/common/evas_font_load.c | 6 +++--- legacy/evas/src/lib/engines/common/evas_image_load.c | 2 +- legacy/evas/src/lib/engines/common/evas_image_scalecache.c | 6 +++--- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/legacy/evas/src/lib/cache/evas_cache_image.c b/legacy/evas/src/lib/cache/evas_cache_image.c index 71d2648..387ba2d 100644 --- a/legacy/evas/src/lib/cache/evas_cache_image.c +++ b/legacy/evas/src/lib/cache/evas_cache_image.c @@ -707,10 +707,9 @@ EAPI Image_Entry * evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *key, RGBA_Image_Loadopts *lo, int *error) { const char *ckey = "(null)"; - const char *format; char *hkey; Image_Entry *im; - Evas_Image_Load_Opts prevent = { 0, 0, 0, 0, 0, 0, 0, 0 }; + Evas_Image_Load_Opts prevent = { 0, 0, 0, 0, { 0, 0, 0, 0 } }; size_t size; int stat_done = 0; size_t file_length; diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index a9172b7..39fbf89 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -3300,7 +3300,6 @@ EAPI Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur) { int index, ch; - int at_start_of_line = 0; if (!cur) return EINA_FALSE; if (!cur->node) return EINA_FALSE; diff --git a/legacy/evas/src/lib/canvas/evas_stats.c b/legacy/evas/src/lib/canvas/evas_stats.c index 3fbbaba..59584c5 100644 --- a/legacy/evas/src/lib/canvas/evas_stats.c +++ b/legacy/evas/src/lib/canvas/evas_stats.c @@ -68,8 +68,7 @@ evas_cserve_image_cache_contents_get(Evas_Cserve_Image_Cache *cache) { Evas_Cserve_Image *im; Op_Getinfo_Item it; - char *file, *key, buf[512]; - struct tm *ltm; + char *file, *key; itt = (Op_Getinfo_Item *)p; memcpy(&it, itt, sizeof(Op_Getinfo_Item)); diff --git a/legacy/evas/src/lib/cserve/evas_cs_client.c b/legacy/evas/src/lib/cserve/evas_cs_client.c index 18f2c4a..9c106b6 100644 --- a/legacy/evas/src/lib/cserve/evas_cs_client.c +++ b/legacy/evas/src/lib/cserve/evas_cs_client.c @@ -14,7 +14,7 @@ static int connect_num = 0; static int cserve_discon = 0; static void -pipe_handler(int x, siginfo_t *info, void *data) +pipe_handler(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { } diff --git a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c b/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c index 64d3756..8f8bb46 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c @@ -6,7 +6,7 @@ #include "evas_convert_grypal_6.h" #ifdef BUILD_CONVERT_8_GRAYSCALE_64 -void evas_common_convert_rgba_to_8bpp_pal_gray64 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c index 60c98ab..f571f94 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_load.c +++ b/legacy/evas/src/lib/engines/common/evas_font_load.c @@ -20,8 +20,8 @@ static Eina_Bool font_modify_cache_cb(const Eina_Hash *hash, const void *key, vo static Eina_Bool font_flush_free_glyph_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata); static int -_evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length, - const RGBA_Font_Int *k2, int k2_length) +_evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length __UNUSED__, + const RGBA_Font_Int *k2, int k2_length __UNUSED__) { /* RGBA_Font_Source->name is a stringshare */ if (k1->src->name == k2->src->name) @@ -30,7 +30,7 @@ _evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length, } static int -_evas_font_cache_int_hash(const RGBA_Font_Int *key, int key_length) +_evas_font_cache_int_hash(const RGBA_Font_Int *key, int key_length __UNUSED__) { int hash; diff --git a/legacy/evas/src/lib/engines/common/evas_image_load.c b/legacy/evas/src/lib/engines/common/evas_image_load.c index baf7361..b17771e 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_load.c +++ b/legacy/evas/src/lib/engines/common/evas_image_load.c @@ -37,7 +37,7 @@ static const char *loaders_name[] = { }; static Eina_Bool -_evas_image_foreach_loader(const Eina_Hash *hash, const char *key, Evas_Module *em, Image_Entry *ie) +_evas_image_foreach_loader(const Eina_Hash *hash __UNUSED__, const char *key __UNUSED__, Evas_Module *em, Image_Entry *ie) { Evas_Image_Load_Func *evas_image_load_func = NULL; diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c index ec8a525..21b8523 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c +++ b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c @@ -190,7 +190,7 @@ _sci_fix_newest(RGBA_Image *im) static Scaleitem * _sci_find(RGBA_Image *im, - RGBA_Draw_Context *dc, int smooth, + RGBA_Draw_Context *dc __UNUSED__, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h) @@ -343,11 +343,11 @@ evas_common_rgba_image_scalecache_flush(void) } EAPI void -evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst, +evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNUSED__, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, - int dst_region_x, int dst_region_y, + int dst_region_x __UNUSED__, int dst_region_y __UNUSED__, int dst_region_w, int dst_region_h) { #ifdef SCALECACHE -- 2.7.4