Please consider helping with -Wextra cleanup, see commit below:
---------- Forwarded message ----------
From: Enlightenment SVN <no-re...@enlightenment.org>
Date: Sat, Sep 18, 2010 at 4:17 PM
Subject: E SVN: barbieri IN trunk/evas/src: lib/cache lib/canvas
lib/engines/common lib/engines/common_8 modules/engines/buffer
modules/engines/fb modules/engines/gl_x11 modules/engines/software_16
modules/engines/software_16_sdl modules/engines/software_16_x11
modules/engines/software_8 modules/engines/software_8_x11
modules/engines/software_generic modules/engines/software_sdl
modules/engines/xrender_x11 modules/loaders/eet modules/loaders/gif
modules/loaders/jpeg modules/loaders/pmaps modules/loaders/png
modules/loaders/svg modules/loaders/tiff modules/loaders/xpm
modules/savers/eet modules/savers/jpeg modules/savers/png
modules/savers/tiff
To: enlightenment-...@lists.sourceforge.net
Log:
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.
Author: barbieri
Date: 2010-09-18 12:17:41 -0700 (Sat, 18 Sep 2010)
New Revision: 52421
Modified:
trunk/evas/src/lib/cache/evas_preload.c
trunk/evas/src/lib/canvas/evas_map.c
trunk/evas/src/lib/engines/common/evas_convert_gry_8.c
trunk/evas/src/lib/engines/common/evas_font_load.c
trunk/evas/src/lib/engines/common_8/evas_soft8_dither_mask.c
trunk/evas/src/lib/engines/common_8/evas_soft8_main.c
trunk/evas/src/modules/engines/buffer/evas_engine.c
trunk/evas/src/modules/engines/fb/evas_engine.c
trunk/evas/src/modules/engines/gl_x11/evas_engine.c
trunk/evas/src/modules/engines/software_16/evas_engine.c
trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c
trunk/evas/src/modules/engines/software_16_x11/evas_engine.c
trunk/evas/src/modules/engines/software_8/evas_engine.c
trunk/evas/src/modules/engines/software_8_x11/evas_engine.c
trunk/evas/src/modules/engines/software_generic/evas_engine.c
trunk/evas/src/modules/engines/software_sdl/evas_engine.c
trunk/evas/src/modules/engines/xrender_x11/evas_engine.c
trunk/evas/src/modules/engines/xrender_x11/evas_engine_xlib_font.c
trunk/evas/src/modules/loaders/eet/evas_image_load_eet.c
trunk/evas/src/modules/loaders/gif/evas_image_load_gif.c
trunk/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
trunk/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c
trunk/evas/src/modules/loaders/png/evas_image_load_png.c
trunk/evas/src/modules/loaders/svg/evas_image_load_svg.c
trunk/evas/src/modules/loaders/tiff/evas_image_load_tiff.c
trunk/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
trunk/evas/src/modules/savers/eet/evas_image_save_eet.c
trunk/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c
trunk/evas/src/modules/savers/png/evas_image_save_png.c
trunk/evas/src/modules/savers/tiff/evas_image_save_tiff.c
Modified: trunk/evas/src/lib/cache/evas_preload.c
===================================================================
--- trunk/evas/src/lib/cache/evas_preload.c 2010-09-18 17:43:13
UTC (rev 52420)
+++ trunk/evas/src/lib/cache/evas_preload.c 2010-09-18 19:17:41
UTC (rev 52421)
@@ -184,7 +184,6 @@
/* 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();
Modified: trunk/evas/src/lib/canvas/evas_map.c
===================================================================
--- trunk/evas/src/lib/canvas/evas_map.c 2010-09-18 17:43:13
UTC (rev 52420)
+++ trunk/evas/src/lib/canvas/evas_map.c 2010-09-18 19:17:41
UTC (rev 52421)
@@ -349,6 +349,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
+ (void)src; /* method still needs to be implemented. */
}
/**
Modified: trunk/evas/src/lib/engines/common/evas_convert_gry_8.c
===================================================================
--- trunk/evas/src/lib/engines/common/evas_convert_gry_8.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/lib/engines/common/evas_convert_gry_8.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -9,7 +9,7 @@
#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 @@
#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 @@
#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
Modified: trunk/evas/src/lib/engines/common/evas_font_load.c
===================================================================
--- trunk/evas/src/lib/engines/common/evas_font_load.c 2010-09-18
17:43:13 UTC (rev 52420)
+++ trunk/evas/src/lib/engines/common/evas_font_load.c 2010-09-18
19:17:41 UTC (rev 52421)
@@ -254,12 +254,12 @@
}
}
-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 @@
}
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);
Modified: trunk/evas/src/lib/engines/common_8/evas_soft8_dither_mask.c
===================================================================
--- trunk/evas/src/lib/engines/common_8/evas_soft8_dither_mask.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/lib/engines/common_8/evas_soft8_dither_mask.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
Modified: trunk/evas/src/lib/engines/common_8/evas_soft8_main.c
===================================================================
--- trunk/evas/src/lib/engines/common_8/evas_soft8_main.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/lib/engines/common_8/evas_soft8_main.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -291,7 +291,7 @@
}
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 @@
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;
Modified: trunk/evas/src/modules/engines/buffer/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/buffer/evas_engine.c 2010-09-18
17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/buffer/evas_engine.c 2010-09-18
19:17:41 UTC (rev 52421)
@@ -379,7 +379,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
eina_log_domain_unregister(_evas_engine_buffer_log_dom);
}
Modified: trunk/evas/src/modules/engines/fb/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/fb/evas_engine.c 2010-09-18
17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/fb/evas_engine.c 2010-09-18
19:17:41 UTC (rev 52421)
@@ -247,7 +247,7 @@
}
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 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
eina_log_domain_unregister(_evas_engine_fb_log_dom);
}
Modified: trunk/evas/src/modules/engines/gl_x11/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/gl_x11/evas_engine.c 2010-09-18
17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/gl_x11/evas_engine.c 2010-09-18
19:17:41 UTC (rev 52421)
@@ -460,11 +460,8 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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)
Modified: trunk/evas/src/modules/engines/software_16/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/software_16/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/software_16/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -718,12 +718,13 @@
eng_image_scale_hint_set,
eng_image_scale_hint_get,
/* more font draw functions */
- eng_font_last_up_to_pos
+ 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 */
-// ORD(image_map4_draw);
-// ORD(image_map_surface_new);
-// ORD(image_map_surface_free);
- /* FUTURE software generic calls go here */
};
/*
@@ -750,7 +751,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
eina_log_domain_unregister(_evas_soft16_log_dom);
}
Modified: trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -465,8 +465,6 @@
_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 @@
}
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 @@
}
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 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
eina_log_domain_unregister(_evas_engine_soft16_sdl_log_dom);
}
Modified: trunk/evas/src/modules/engines/software_16_x11/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/software_16_x11/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/software_16_x11/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -704,7 +704,7 @@
}
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)
Modified: trunk/evas/src/modules/engines/software_8/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/software_8/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/software_8/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -613,7 +613,7 @@
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 @@
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 @@
}
static void
-module_close(Evas_Module * em)
+module_close(Evas_Module * em __UNUSED__)
{
eina_log_domain_unregister(_evas_soft8_log_dom);
}
Modified: trunk/evas/src/modules/engines/software_8_x11/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/software_8_x11/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/software_8_x11/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -678,7 +678,7 @@
}
static void
-module_close(Evas_Module * em)
+module_close(Evas_Module * em __UNUSED__)
{
eina_log_domain_unregister(_evas_engine_soft8_x11_log_dom);
}
Modified: trunk/evas/src/modules/engines/software_generic/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/software_generic/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/software_generic/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -918,7 +918,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
eina_log_domain_unregister(_evas_soft_gen_log_dom);
}
Modified: trunk/evas/src/modules/engines/software_sdl/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/software_sdl/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/software_sdl/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -924,7 +924,7 @@
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);
}
Modified: trunk/evas/src/modules/engines/xrender_x11/evas_engine.c
===================================================================
--- trunk/evas/src/modules/engines/xrender_x11/evas_engine.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/xrender_x11/evas_engine.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -476,7 +476,7 @@
#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 @@
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 @@
}
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 @@
}
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 @@
}
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
Modified: trunk/evas/src/modules/engines/xrender_x11/evas_engine_xlib_font.c
===================================================================
--- trunk/evas/src/modules/engines/xrender_x11/evas_engine_xlib_font.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/engines/xrender_x11/evas_engine_xlib_font.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -129,7 +129,7 @@
}
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;
Modified: trunk/evas/src/modules/loaders/eet/evas_image_load_eet.c
===================================================================
--- trunk/evas/src/modules/loaders/eet/evas_image_load_eet.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/eet/evas_image_load_eet.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -153,7 +153,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/loaders/gif/evas_image_load_gif.c
===================================================================
--- trunk/evas/src/modules/loaders/gif/evas_image_load_gif.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/gif/evas_image_load_gif.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -305,7 +305,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
===================================================================
--- trunk/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -760,7 +760,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c
===================================================================
--- trunk/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -556,7 +556,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/loaders/png/evas_image_load_png.c
===================================================================
--- trunk/evas/src/modules/loaders/png/evas_image_load_png.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/png/evas_image_load_png.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -256,7 +256,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/loaders/svg/evas_image_load_svg.c
===================================================================
--- trunk/evas/src/modules/loaders/svg/evas_image_load_svg.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/svg/evas_image_load_svg.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -252,7 +252,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
if (!rsvg_initialized) return;
//rsvg_term();
Modified: trunk/evas/src/modules/loaders/tiff/evas_image_load_tiff.c
===================================================================
--- trunk/evas/src/modules/loaders/tiff/evas_image_load_tiff.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/tiff/evas_image_load_tiff.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -374,7 +374,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
eina_log_domain_unregister(_evas_loader_tiff_log_dom);
}
Modified: trunk/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
===================================================================
--- trunk/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -666,7 +666,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
eina_log_domain_unregister(_evas_loader_xpm_log_dom);
}
Modified: trunk/evas/src/modules/savers/eet/evas_image_save_eet.c
===================================================================
--- trunk/evas/src/modules/savers/eet/evas_image_save_eet.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/savers/eet/evas_image_save_eet.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -60,7 +60,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c
===================================================================
--- trunk/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -122,7 +122,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/savers/png/evas_image_save_png.c
===================================================================
--- trunk/evas/src/modules/savers/png/evas_image_save_png.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/savers/png/evas_image_save_png.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -166,7 +166,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
Modified: trunk/evas/src/modules/savers/tiff/evas_image_save_tiff.c
===================================================================
--- trunk/evas/src/modules/savers/tiff/evas_image_save_tiff.c
2010-09-18 17:43:13 UTC (rev 52420)
+++ trunk/evas/src/modules/savers/tiff/evas_image_save_tiff.c
2010-09-18 19:17:41 UTC (rev 52421)
@@ -116,7 +116,7 @@
}
static void
-module_close(Evas_Module *em)
+module_close(Evas_Module *em __UNUSED__)
{
}
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
enlightenment-svn mailing list
enlightenment-...@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
--
Gustavo Sverzut Barbieri
http://profusion.mobi embedded systems
--------------------------------------
MSN: barbi...@gmail.com
Skype: gsbarbieri
Mobile: +55 (19) 9225-2202
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
