cleanup: fix some "unused" errors from -Wextra.

As we're heading for a release we better remove as much errors as
possible and as the first step I'm removing warnings due unused
parameters, variables and functions. These tend to pollute real errors
spotted by -Wall and clang/llvm.

This does not fixes all, just the clear that could be set to
__UNUSED__, particularly to do (and I'd like some help from the
authors):

 * src/lib/engines/common/evas_font_{draw,query}.c (tasn):
   intl_props is just used while doing BIDI, but also used in other
   #ifdef blocks :-/

 * evas_map_* (raster):
   huge amount of warnings, code is quite confusing and thus I'm not
   touching it. I have no idea whenever the commented blocks or extra
   parameters are intended to be used or no.

 * src/modules/engines/fbevas_fb_main.c (raster?):
   is fb_setvt() to be used? If not do you mind removing it?

 * src/modules/engines/gl_{common,x11} (raster):
   huge amount of warnings, code is quite nested and full of #ifdefs
   that does not help to give a clear picture of what's going on.

 * src/bin/evas_cserve_main.c (raster):
   I could have ignored most of the errors, but is the code correct? I
   mean, there is no unload of images being applied. If you confirm
   none of those warnings are harmful I can flag them as unused.

 * src/lib/engines/common_8 (dottedmag):
   lots of unused functions that were acquired from common_16, they
   are unused and if they will not, then they should be removed.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@52421 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/cache/evas_preload.c b/src/lib/cache/evas_preload.c
index e8eee91..38f9248 100644 (file)
--- a/src/lib/cache/evas_preload.c
+++ b/src/lib/cache/evas_preload.c
@@ -184,7 +184,6 @@ _evas_preload_thread_shutdown(void)
    /* FIXME: If function are still running in the background, should we kill them ? */
 #ifdef BUILD_ASYNC_PRELOAD
    Evas_Preload_Pthread_Worker *work;
-   Evas_Preload_Pthread_Data *pth;
 
    /* Force processing of async events. */
    evas_async_events_process();

diff --git a/src/lib/canvas/evas_map.c b/src/lib/canvas/evas_map.c
index 9cca204..8e34a00 100644 (file)
--- a/src/lib/canvas/evas_map.c
+++ b/src/lib/canvas/evas_map.c
@@ -349,6 +349,7 @@ evas_object_map_source_set(Evas_Object *obj, Evas_Object *src)
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
+   (void)src; /* method still needs to be implemented. */
 }
 
 /**

diff --git a/src/lib/engines/common/evas_convert_gry_8.c b/src/lib/engines/common/evas_convert_gry_8.c
index 66934e3..9bc5ca7 100644 (file)
--- a/src/lib/engines/common/evas_convert_gry_8.c
+++ b/src/lib/engines/common/evas_convert_gry_8.c
@@ -9,7 +9,7 @@ extern const DATA8 _evas_dither_128128[128][128];
 #endif
 
 #ifdef BUILD_CONVERT_8_GRY_1
-void evas_common_convert_rgba_to_8bpp_gry_256_dith     (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_gry_256_dith     (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
 {
    DATA32 *src_ptr;
    DATA8 *dst_ptr;
@@ -35,11 +35,11 @@ void evas_common_convert_rgba_to_8bpp_gry_256_dith     (DATA32 *src, DATA8 *dst,
 #endif
 
 #ifdef BUILD_CONVERT_8_GRY_4
-void evas_common_convert_rgba_to_8bpp_gry_64_dith      (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_gry_64_dith      (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){}
 #endif
 
 #ifdef BUILD_CONVERT_8_GRY_16
-void evas_common_convert_rgba_to_8bpp_gry_16_dith      (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_gry_16_dith      (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal __UNUSED__)
 {
    DATA32 *src_ptr;
    DATA8 *dst_ptr;
@@ -70,9 +70,9 @@ void evas_common_convert_rgba_to_8bpp_gry_16_dith      (DATA32 *src, DATA8 *dst,
 #endif
 
 #ifdef BUILD_CONVERT_8_GRY_64
-void evas_common_convert_rgba_to_8bpp_gry_4_dith       (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_gry_4_dith       (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){}
 #endif
 
 #ifdef BUILD_CONVERT_8_GRY_256
-void evas_common_convert_rgba_to_8bpp_gry_1_dith       (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_gry_1_dith       (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){}
 #endif

diff --git a/src/lib/engines/common/evas_font_load.c b/src/lib/engines/common/evas_font_load.c
index 4acbc9f..8b57956 100644 (file)
--- a/src/lib/engines/common/evas_font_load.c
+++ b/src/lib/engines/common/evas_font_load.c
@@ -254,12 +254,12 @@ evas_common_font_size_use(RGBA_Font *fn)
      }
 }
 
-static int
-_evas_common_font_int_cmp(const int *key1, __UNUSED__ int key1_length,
-                         const int *key2, __UNUSED__ int key2_length)
-{
-   return *key1 - *key2;
-}
+//static int
+//_evas_common_font_int_cmp(const int *key1, __UNUSED__ int key1_length,
+//                       const int *key2, __UNUSED__ int key2_length)
+//{
+//   return *key1 - *key2;
+//}
 
 static int
 _evas_common_font_double_int_cmp(const int *key1, __UNUSED__ int key1_length,
@@ -736,7 +736,7 @@ _evas_common_font_int_clear(RGBA_Font_Int *fi)
 }
 
 static Eina_Bool
-_evas_common_font_all_clear_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
+_evas_common_font_all_clear_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
    RGBA_Font_Int *fi = data;
    _evas_common_font_int_clear(fi);

diff --git a/src/lib/engines/common_8/evas_soft8_dither_mask.c b/src/lib/engines/common_8/evas_soft8_dither_mask.c
index fcff6a6..c06968c 100644 (file)
--- a/src/lib/engines/common_8/evas_soft8_dither_mask.c
+++ b/src/lib/engines/common_8/evas_soft8_dither_mask.c
@@ -1,8 +1,7 @@
 #include "evas_common_soft8.h"
 
 static always_inline void
-_soft8_convert_from_rgba_pt(const DATA32 * src, DATA8 * dst, DATA8 * alpha,
-                            const int x, const int y)
+_soft8_convert_from_rgba_pt(const DATA32 * src, DATA8 * dst, DATA8 * alpha)
 {
    if (A_VAL(src) == 0)
      {
@@ -18,7 +17,7 @@ _soft8_convert_from_rgba_pt(const DATA32 * src, DATA8 * dst, DATA8 * alpha,
 
 static inline void
 _soft8_convert_from_rgba_scanline(const DATA32 * src, DATA8 * dst,
-                                  DATA8 * alpha, const int y, const int w)
+                                  DATA8 * alpha, const int w)
 {
    int x, m;
 
@@ -31,13 +30,13 @@ _soft8_convert_from_rgba_scanline(const DATA32 * src, DATA8 * dst,
         pld(src, 32);
         UNROLL8(
                   {
-                  _soft8_convert_from_rgba_pt(src, dst, alpha, x, y);
+                  _soft8_convert_from_rgba_pt(src, dst, alpha);
                   src++; dst++; alpha++; x++;}
         );
      }
 
    for (; x < w; x++, src++, dst++, alpha++)
-      _soft8_convert_from_rgba_pt(src, dst, alpha, x, y);
+      _soft8_convert_from_rgba_pt(src, dst, alpha);
 }
 
 void
@@ -54,19 +53,17 @@ evas_common_soft8_image_convert_from_rgba(Soft8_Image * im, const DATA32 * src)
 
    for (y = 0; y < im->cache_entry.h;
         y++, sp += im->cache_entry.w, dp += im->stride, ap += im->stride)
-      _soft8_convert_from_rgba_scanline(sp, dp, ap, y, im->cache_entry.w);
+      _soft8_convert_from_rgba_scanline(sp, dp, ap, im->cache_entry.w);
 }
 
 static always_inline void
-_soft8_convert_from_rgb_pt(const DATA32 * src, DATA8 * dst,
-                           const int x, const int y)
+_soft8_convert_from_rgb_pt(const DATA32 * src, DATA8 * dst)
 {
    *dst = GRY_8_FROM_RGB(src);
 }
 
 static inline void
-_soft8_convert_from_rgb_scanline(const DATA32 * src, DATA8 * dst, const int y,
-                                 const int w)
+_soft8_convert_from_rgb_scanline(const DATA32 * src, DATA8 * dst, const int w)
 {
    int x, m;
 
@@ -79,12 +76,12 @@ _soft8_convert_from_rgb_scanline(const DATA32 * src, DATA8 * dst, const int y,
         pld(src, 32);
         UNROLL8(
                   {
-                  _soft8_convert_from_rgb_pt(src, dst, x, y); src++; dst++; x++;}
+                  _soft8_convert_from_rgb_pt(src, dst); src++; dst++; x++;}
         );
      }
 
    for (; x < w; x++, src++, dst++)
-      _soft8_convert_from_rgb_pt(src, dst, x, y);
+      _soft8_convert_from_rgb_pt(src, dst);
 }
 
 void
@@ -99,5 +96,5 @@ evas_common_soft8_image_convert_from_rgb(Soft8_Image * im, const DATA32 * src)
 
    for (y = 0; y < im->cache_entry.h;
         y++, sp += im->cache_entry.w, dp += im->stride)
-      _soft8_convert_from_rgb_scanline(sp, dp, y, im->cache_entry.w);
+      _soft8_convert_from_rgb_scanline(sp, dp, im->cache_entry.w);
 }

diff --git a/src/lib/engines/common_8/evas_soft8_main.c b/src/lib/engines/common_8/evas_soft8_main.c
index aec32ab..337d8a0 100644 (file)
--- a/src/lib/engines/common_8/evas_soft8_main.c
+++ b/src/lib/engines/common_8/evas_soft8_main.c
@@ -291,7 +291,7 @@ _evas_common_soft8_image_from_copied_data(Image_Entry * ie_dst,
 }
 
 static int
-_evas_common_soft8_image_colorspace_set(Image_Entry * ie_dst,
+_evas_common_soft8_image_colorspace_set(Image_Entry * ie_dst __UNUSED__,
                                         int cspace __UNUSED__)
 {
    /* FIXME: handle colorspace */
@@ -524,7 +524,7 @@ evas_common_soft8_image_draw(Soft8_Image * src, Soft8_Image * dst,
                  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_w, int dst_region_h, int smooth)
+                 int dst_region_w, int dst_region_h, int smooth __UNUSED__)
 {
    Eina_Rectangle sr, dr;
    Cutout_Rects *rects;

diff --git a/src/modules/engines/buffer/evas_engine.c b/src/modules/engines/buffer/evas_engine.c
index ec10c25..0e7934c 100644 (file)
--- a/src/modules/engines/buffer/evas_engine.c
+++ b/src/modules/engines/buffer/evas_engine.c
@@ -379,7 +379,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
   eina_log_domain_unregister(_evas_engine_buffer_log_dom);
 }

diff --git a/src/modules/engines/fb/evas_engine.c b/src/modules/engines/fb/evas_engine.c
index 28821ce..5b8900c 100644 (file)
--- a/src/modules/engines/fb/evas_engine.c
+++ b/src/modules/engines/fb/evas_engine.c
@@ -247,7 +247,7 @@ eng_output_idle_flush(void *data)
 }
 
 static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context)
+eng_canvas_alpha_get(void *data, void *context __UNUSED__)
 {
    Render_Engine *re;
 
@@ -292,7 +292,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
   eina_log_domain_unregister(_evas_engine_fb_log_dom);
 }

diff --git a/src/modules/engines/gl_x11/evas_engine.c b/src/modules/engines/gl_x11/evas_engine.c
index 2c7aa24..9775cc4 100644 (file)
--- a/src/modules/engines/gl_x11/evas_engine.c
+++ b/src/modules/engines/gl_x11/evas_engine.c
@@ -460,11 +460,8 @@ eng_output_resize(void *data, int w, int h)
 }
 
 static void
-eng_output_tile_size_set(void *data, int w __UNUSED__, int h __UNUSED__)
+eng_output_tile_size_set(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__)
 {
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
 }
 
 static void
@@ -502,11 +499,8 @@ eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
 }
 
 static void
-eng_output_redraws_rect_del(void *data, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
+eng_output_redraws_rect_del(void *data __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
 {
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
 }
 
 static void
@@ -712,7 +706,7 @@ eng_output_dump(void *data)
 }
 
 static void
-eng_context_cutout_add(void *data, void *context, int x, int y, int w, int h)
+eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h)
 {
 //   Render_Engine *re;
 //
@@ -722,7 +716,7 @@ eng_context_cutout_add(void *data, void *context, int x, int y, int w, int h)
 }
 
 static void
-eng_context_cutout_clear(void *data, void *context)
+eng_context_cutout_clear(void *data __UNUSED__, void *context)
 {
 //   Render_Engine *re;
 //
@@ -786,7 +780,7 @@ eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *poly
 }
 
 static int
-eng_image_alpha_get(void *data, void *image)
+eng_image_alpha_get(void *data __UNUSED__, void *image)
 {
 //   Render_Engine *re;
    Evas_GL_Image *im;
@@ -798,7 +792,7 @@ eng_image_alpha_get(void *data, void *image)
 }
 
 static int
-eng_image_colorspace_get(void *data, void *image)
+eng_image_colorspace_get(void *data __UNUSED__, void *image)
 {
 //   Render_Engine *re;
    Evas_GL_Image *im;
@@ -856,7 +850,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha)
 }
 
 static void *
-eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
+eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
 {
 //   Render_Engine *re;
 //
@@ -865,7 +859,7 @@ eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__
 }
 
 static void
-eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
+eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
 {
 //   Render_Engine *re;
 //
@@ -873,7 +867,7 @@ eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int
 }
 
 static char *
-eng_image_comment_get(void *data, void *image, char *key __UNUSED__)
+eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
 {
 //   Render_Engine *re;
    Evas_GL_Image *im;
@@ -886,7 +880,7 @@ eng_image_comment_get(void *data, void *image, char *key __UNUSED__)
 }
 
 static char *
-eng_image_format_get(void *data, void *image)
+eng_image_format_get(void *data __UNUSED__, void *image)
 {
 //   Render_Engine *re;
    Evas_GL_Image *im;
@@ -1313,9 +1307,8 @@ eng_image_native_set(void *data, void *image, void *native)
 }
 
 static void *
-eng_image_native_get(void *data, void *image)
+eng_image_native_get(void *data __UNUSED__, void *image)
 {
-   Render_Engine *re = (Render_Engine *)data;
    Evas_GL_Image *im = image;
    Native *n;
    if (!im) return NULL;
@@ -1371,7 +1364,7 @@ eng_image_free(void *data, void *image)
 }
 
 static void
-eng_image_size_get(void *data, void *image, int *w, int *h)
+eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
 {
    if (!image)
      {
@@ -1713,9 +1706,8 @@ eng_image_content_hint_get(void *data __UNUSED__, void *image)
 }
 
 static void
-eng_image_stride_get(void *data, void *image, int *stride)
+eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
 {
-   Render_Engine *re = (Render_Engine *)data;
    Evas_GL_Image *im = image;
    *stride = im->w;
    if ((im->tex) && (im->tex->pt->dyn.img)) *stride = im->tex->pt->dyn.w;
@@ -1848,7 +1840,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
     eina_log_domain_unregister(_evas_engine_GL_X11_log_dom);
     if (xrdb_user.db)

diff --git a/src/modules/engines/software_16/evas_engine.c b/src/modules/engines/software_16/evas_engine.c
index 202ae43..7978d84 100644 (file)
--- a/src/modules/engines/software_16/evas_engine.c
+++ b/src/modules/engines/software_16/evas_engine.c
@@ -718,11 +718,12 @@ static Evas_Func func =
      eng_image_scale_hint_set,
      eng_image_scale_hint_get,
      /* more font draw functions */
-     eng_font_last_up_to_pos
-     /* FUTURE software generic calls go here */
-//   ORD(image_map4_draw);
-//   ORD(image_map_surface_new);
-//   ORD(image_map_surface_free);
+     eng_font_last_up_to_pos,
+     NULL, //   ORD(image_map4_draw);
+     NULL, //   ORD(image_map_surface_new);
+     NULL, //   ORD(image_map_surface_free);
+     NULL, // eng_image_content_hint_set - software doesn't use it
+     NULL // eng_image_content_hint_get - software doesn't use it
      /* FUTURE software generic calls go here */
 };
 
@@ -750,7 +751,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
    eina_log_domain_unregister(_evas_soft16_log_dom);
 }

diff --git a/src/modules/engines/software_16_sdl/evas_engine.c b/src/modules/engines/software_16_sdl/evas_engine.c
index 1c8c5f7..5e32827 100644 (file)
--- a/src/modules/engines/software_16_sdl/evas_engine.c
+++ b/src/modules/engines/software_16_sdl/evas_engine.c
@@ -465,8 +465,6 @@ static void
 _tmp_out_process(Render_Engine *re, int out_x, int out_y, int w, int h)
 {
    Soft16_Image *d, *s;
-   DATA16 *dp, *sp;
-   int y, x, d_dir;
 
    d = (Soft16_Image *) re->soft16_engine_image->cache_entry.src;
    s = re->tmp_out;
@@ -819,17 +817,17 @@ evas_engine_sdl16_image_draw(void *data __UNUSED__, void *context, void *surface
 }
 
 static void
-evas_engine_sdl16_image_map4_draw(void *data __UNUSED__, void *context, void *surface, void *image, RGBA_Map_Point *p, int smooth, int level)
+evas_engine_sdl16_image_map4_draw(void *data __UNUSED__, void *context __UNUSED__, void *surface __UNUSED__, void *image __UNUSED__, RGBA_Map_Point *p __UNUSED__, int smooth __UNUSED__, int level __UNUSED__)
 {
 }
 
 static void
-evas_engine_sdl16_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
+evas_engine_sdl16_image_scale_hint_set(void *data __UNUSED__, void *image __UNUSED__, int hint __UNUSED__)
 {
 }
 
 static int
-evas_engine_sdl16_image_scale_hint_get(void *data __UNUSED__, void *image)
+evas_engine_sdl16_image_scale_hint_get(void *data __UNUSED__, void *image __UNUSED__)
 {
    return EVAS_IMAGE_SCALE_HINT_NONE;
 }
@@ -1021,7 +1019,7 @@ evas_engine_sdl16_image_stride_get(void *data __UNUSED__, void *image, int *stri
 }
 
 static Eina_Bool
-evas_engine_sdl16_canvas_alpha_get(void *data, void *context)
+evas_engine_sdl16_canvas_alpha_get(void *data __UNUSED__, void *context __UNUSED__)
 {
    return EINA_FALSE;
 }
@@ -1097,7 +1095,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
   eina_log_domain_unregister(_evas_engine_soft16_sdl_log_dom);
 }

diff --git a/src/modules/engines/software_16_x11/evas_engine.c b/src/modules/engines/software_16_x11/evas_engine.c
index 82a54e4..ec70877 100644 (file)
--- a/src/modules/engines/software_16_x11/evas_engine.c
+++ b/src/modules/engines/software_16_x11/evas_engine.c
@@ -704,7 +704,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
   eina_log_domain_unregister(_evas_engine_soft16_x11_log_dom);
   if (xrdb_user.db)

diff --git a/src/modules/engines/software_8/evas_engine.c b/src/modules/engines/software_8/evas_engine.c
index d0e9895..3681041 100644 (file)
--- a/src/modules/engines/software_8/evas_engine.c
+++ b/src/modules/engines/software_8/evas_engine.c
@@ -613,7 +613,7 @@ eng_font_last_up_to_pos(void *data __UNUSED__, void *font, const Eina_Unicode *t
 
 static void
 eng_font_draw(void *data __UNUSED__, void *context, void *surface, void *font,
-              int x, int y, int w, int h, int ow, int oh, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props)
+              int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props)
 {
    evas_common_font_draw(surface, context, font, x, y, text, intl_props);
    evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
@@ -762,12 +762,13 @@ static Evas_Func func = {
    eng_image_scale_hint_set,
    eng_image_scale_hint_get,
    /* more font draw functions */
-   eng_font_last_up_to_pos
-       /* FUTURE software generic calls go here */
-//   ORD(image_map4_draw);
-//   ORD(image_map_surface_new);
-//   ORD(image_map_surface_free);
-       /* FUTURE software generic calls go here */
+   eng_font_last_up_to_pos,
+   NULL, //   ORD(image_map4_draw);
+   NULL, //   ORD(image_map_surface_new);
+   NULL, //   ORD(image_map_surface_free);
+   NULL, // eng_image_content_hint_set - software doesn't use it
+   NULL // eng_image_content_hint_get - software doesn't use it
+   /* FUTURE software generic calls go here */
 };
 
 /*
@@ -797,7 +798,7 @@ module_open(Evas_Module * em)
 }
 
 static void
-module_close(Evas_Module * em)
+module_close(Evas_Module * em __UNUSED__)
 {
    eina_log_domain_unregister(_evas_soft8_log_dom);
 }

diff --git a/src/modules/engines/software_8_x11/evas_engine.c b/src/modules/engines/software_8_x11/evas_engine.c
index 9befd2a..08e43e3 100644 (file)
--- a/src/modules/engines/software_8_x11/evas_engine.c
+++ b/src/modules/engines/software_8_x11/evas_engine.c
@@ -678,7 +678,7 @@ module_open(Evas_Module * em)
 }
 
 static void
-module_close(Evas_Module * em)
+module_close(Evas_Module * em __UNUSED__)
 {
    eina_log_domain_unregister(_evas_engine_soft8_x11_log_dom);
 }

diff --git a/src/modules/engines/software_generic/evas_engine.c b/src/modules/engines/software_generic/evas_engine.c
index 09c4c2d..97520b8 100644 (file)
--- a/src/modules/engines/software_generic/evas_engine.c
+++ b/src/modules/engines/software_generic/evas_engine.c
@@ -918,7 +918,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
   eina_log_domain_unregister(_evas_soft_gen_log_dom);
 }

diff --git a/src/modules/engines/software_sdl/evas_engine.c b/src/modules/engines/software_sdl/evas_engine.c
index bcaa3c9..85d6067 100644 (file)
--- a/src/modules/engines/software_sdl/evas_engine.c
+++ b/src/modules/engines/software_sdl/evas_engine.c
@@ -924,7 +924,7 @@ static int module_open(Evas_Module *em)
    return 1;
 }
 
-static void module_close(Evas_Module *em)
+static void module_close(Evas_Module *em __UNUSED__)
 {
   eina_log_domain_unregister(_evas_engine_soft_sdl_log_dom);
 }

diff --git a/src/modules/engines/xrender_x11/evas_engine.c b/src/modules/engines/xrender_x11/evas_engine.c
index 697689b..9e0ae23 100644 (file)
--- a/src/modules/engines/xrender_x11/evas_engine.c
+++ b/src/modules/engines/xrender_x11/evas_engine.c
@@ -476,7 +476,7 @@ eng_setup(Evas *e, void *in)
 #endif /* BUILD_ENGINE_XRENDER_XCB */
 
         if (!re)
-          return;
+          return 0;
 
        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
        if (re->tb)
@@ -485,7 +485,7 @@ eng_setup(Evas *e, void *in)
        resize = 0;
      }
    re = e->engine.data.output;
-   if (!re) return;
+   if (!re) return 0;
 
    if (!e->engine.data.context) e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
 
@@ -1131,12 +1131,12 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x,
 }
 
 static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
+eng_image_scale_hint_set(void *data __UNUSED__, void *image __UNUSED__, int hint __UNUSED__)
 {
 }
 
 static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
+eng_image_scale_hint_get(void *data __UNUSED__, void *image __UNUSED__)
 {
    return EVAS_IMAGE_SCALE_HINT_NONE;
 }
@@ -1204,11 +1204,9 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
 }
 
 static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context)
+eng_canvas_alpha_get(void *data, void *context __UNUSED__)
 {
-   Render_Engine        *re;
-
-   re = (Render_Engine *)data;
+   Render_Engine *re = (Render_Engine *)data;
    return (re->destination_alpha) || (re->x11.mask);
 }
 
@@ -1297,7 +1295,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
   eina_log_domain_unregister(_evas_xrender_xcb_log_dom);
 #ifdef BUILD_ENGINE_SOFTWARE_XLIB

diff --git a/src/modules/engines/xrender_x11/evas_engine_xlib_font.c b/src/modules/engines/xrender_x11/evas_engine_xlib_font.c
index 9f07bce..a23c9eb 100644 (file)
--- a/src/modules/engines/xrender_x11/evas_engine_xlib_font.c
+++ b/src/modules/engines/xrender_x11/evas_engine_xlib_font.c
@@ -129,7 +129,7 @@ _xre_xlib_font_surface_new(Ximage_Info *xinf, RGBA_Font_Glyph *fg)
 }
 
 static Eina_Bool
-_xre_xlib_font_pool_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
+_xre_xlib_font_pool_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
 {
    char buf[256];
    Eina_Hash *pool;

diff --git a/src/modules/loaders/eet/evas_image_load_eet.c b/src/modules/loaders/eet/evas_image_load_eet.c
index 1d0d000..74520d6 100644 (file)
--- a/src/modules/loaders/eet/evas_image_load_eet.c
+++ b/src/modules/loaders/eet/evas_image_load_eet.c
@@ -153,7 +153,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c
index 304181b..65f9733 100644 (file)
--- a/src/modules/loaders/gif/evas_image_load_gif.c
+++ b/src/modules/loaders/gif/evas_image_load_gif.c
@@ -305,7 +305,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/loaders/jpeg/evas_image_load_jpeg.c b/src/modules/loaders/jpeg/evas_image_load_jpeg.c
index 005232c..ee52921 100644 (file)
--- a/src/modules/loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/modules/loaders/jpeg/evas_image_load_jpeg.c
@@ -760,7 +760,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/loaders/pmaps/evas_image_load_pmaps.c b/src/modules/loaders/pmaps/evas_image_load_pmaps.c
index 7281391..a36eb88 100644 (file)
--- a/src/modules/loaders/pmaps/evas_image_load_pmaps.c
+++ b/src/modules/loaders/pmaps/evas_image_load_pmaps.c
@@ -556,7 +556,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/loaders/png/evas_image_load_png.c b/src/modules/loaders/png/evas_image_load_png.c
index 30083bc..24ed652 100644 (file)
--- a/src/modules/loaders/png/evas_image_load_png.c
+++ b/src/modules/loaders/png/evas_image_load_png.c
@@ -256,7 +256,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/loaders/svg/evas_image_load_svg.c b/src/modules/loaders/svg/evas_image_load_svg.c
index 6951e61..f0424c2 100644 (file)
--- a/src/modules/loaders/svg/evas_image_load_svg.c
+++ b/src/modules/loaders/svg/evas_image_load_svg.c
@@ -252,7 +252,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
    if (!rsvg_initialized) return;
    //rsvg_term();

diff --git a/src/modules/loaders/tiff/evas_image_load_tiff.c b/src/modules/loaders/tiff/evas_image_load_tiff.c
index 773fa24..f62c687 100644 (file)
--- a/src/modules/loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/loaders/tiff/evas_image_load_tiff.c
@@ -374,7 +374,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
    eina_log_domain_unregister(_evas_loader_tiff_log_dom);
 }

diff --git a/src/modules/loaders/xpm/evas_image_load_xpm.c b/src/modules/loaders/xpm/evas_image_load_xpm.c
index 6e93d00..ce3f2a2 100644 (file)
--- a/src/modules/loaders/xpm/evas_image_load_xpm.c
+++ b/src/modules/loaders/xpm/evas_image_load_xpm.c
@@ -666,7 +666,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
    eina_log_domain_unregister(_evas_loader_xpm_log_dom);
 }

diff --git a/src/modules/savers/eet/evas_image_save_eet.c b/src/modules/savers/eet/evas_image_save_eet.c
index cbb346e..4eb7176 100644 (file)
--- a/src/modules/savers/eet/evas_image_save_eet.c
+++ b/src/modules/savers/eet/evas_image_save_eet.c
@@ -60,7 +60,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/savers/jpeg/evas_image_save_jpeg.c b/src/modules/savers/jpeg/evas_image_save_jpeg.c
index 1e80965..a07bc2e 100644 (file)
--- a/src/modules/savers/jpeg/evas_image_save_jpeg.c
+++ b/src/modules/savers/jpeg/evas_image_save_jpeg.c
@@ -122,7 +122,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/savers/png/evas_image_save_png.c b/src/modules/savers/png/evas_image_save_png.c
index be399c6..846f443 100644 (file)
--- a/src/modules/savers/png/evas_image_save_png.c
+++ b/src/modules/savers/png/evas_image_save_png.c
@@ -166,7 +166,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }
 

diff --git a/src/modules/savers/tiff/evas_image_save_tiff.c b/src/modules/savers/tiff/evas_image_save_tiff.c
index 8e6f4b3..8148f51 100644 (file)
--- a/src/modules/savers/tiff/evas_image_save_tiff.c
+++ b/src/modules/savers/tiff/evas_image_save_tiff.c
@@ -116,7 +116,7 @@ module_open(Evas_Module *em)
 }
 
 static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
 {
 }