Fix some wextra complains on elm lib

SVN revision: 53635
This commit is contained in:
Bruno Dilly 2010-10-19 18:24:27 +00:00
parent 6e9551b087
commit a109dce782
7 changed files with 28 additions and 14 deletions

View File

@ -105,7 +105,7 @@ _sizing_eval(Evas_Object *obj)
}
static void
_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;

View File

@ -193,7 +193,7 @@ _disable_hook(Evas_Object *obj)
}
static void
_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
_sizing_eval(data);
}

View File

@ -551,9 +551,10 @@ targets_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
}
static Eina_Bool
png_converter(char *target __UNUSED__, void *data, int size,
void **data_ret __UNUSED__, int *size_ret __UNUSED__,
Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
png_converter(char *target __UNUSED__, void *data __UNUSED__,
int size __UNUSED__, void **data_ret __UNUSED__,
int *size_ret __UNUSED__, Ecore_X_Atom *ttype __UNUSED__,
int *typesize __UNUSED__)
{
cnp_debug("Png converter called\n");
return EINA_TRUE;
@ -1154,7 +1155,7 @@ mark_up(const char *start, int inlen, int *lenp){
static Eina_Bool
_dnd_enter(void *data, int etype, void *ev)
_dnd_enter(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
Ecore_X_Event_Xdnd_Enter *enter = ev;
int i;
@ -1190,7 +1191,7 @@ _dnd_enter(void *data, int etype, void *ev)
}
static Eina_Bool
_dnd_drop(void *data, int etype, void *ev)
_dnd_drop(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
struct _Ecore_X_Event_Xdnd_Drop *drop;
struct dropable *dropable;
@ -1325,7 +1326,7 @@ found:
return true;
}
static Eina_Bool
_dnd_position(void *data, int etype, void *ev)
_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
struct _Ecore_X_Event_Xdnd_Position *pos;
Ecore_X_Rectangle rect;
@ -1350,7 +1351,7 @@ _dnd_position(void *data, int etype, void *ev)
* appropriately.
*/
static Eina_Bool
_dnd_status(void *data, int etype, void *ev)
_dnd_status(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
struct _Ecore_X_Event_Xdnd_Status *status = ev;
@ -1474,7 +1475,7 @@ elm_drop_target_del(Evas_Object *obj)
static void
_drag_mouse_up(void *un, Evas *e, Evas_Object *obj, void *data)
_drag_mouse_up(void *un __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *data __UNUSED__)
{
evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP, _drag_mouse_up);
ecore_x_dnd_drop();

View File

@ -1691,6 +1691,9 @@ elm_object_tree_dump(const Evas_Object *top)
{
#ifdef ELM_DEBUG
elm_widget_tree_dump(top);
#else
return;
(void)top;
#endif
}
@ -1708,5 +1711,9 @@ elm_object_tree_dot_dump(const Evas_Object *top, const char *file)
FILE *f = fopen(file, "w");
elm_widget_tree_dot_dump(top, f);
fclose(f);
#else
return;
(void)top;
(void)file;
#endif
}

View File

@ -624,8 +624,7 @@ elm_thumb_animate_set(Evas_Object *obj, Elm_Thumb_Animation_Setting setting)
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (setting >= ELM_THUMB_ANIMATION_LAST)
return;
EINA_SAFETY_ON_TRUE_RETURN(setting >= ELM_THUMB_ANIMATION_LAST);
wd->anim_setting = setting;
if (setting == ELM_THUMB_ANIMATION_LOOP)

View File

@ -2523,6 +2523,9 @@ elm_widget_tree_dump(const Evas_Object *top)
{
#ifdef ELM_DEBUG
_sub_obj_tree_dump(top, 0);
#else
return;
(void)top;
#endif
}
@ -2533,5 +2536,9 @@ elm_widget_tree_dot_dump(const Evas_Object *top, FILE *output)
fprintf(output, "graph "" { node [shape=record];\n");
_sub_obj_tree_dot_dump(top, output);
fprintf(output, "}\n");
#else
return;
(void)top;
(void)output;
#endif
}

View File

@ -477,7 +477,7 @@ _elm_win_client_message(void *data, int type __UNUSED__, void *event)
if (e->format != 32) return ECORE_CALLBACK_PASS_ON;
if (e->message_type == ECORE_X_ATOM_E_COMP_FLUSH)
{
if (e->data.l[0] == win->xwin)
if ((unsigned)e->data.l[0] == win->xwin)
{
Evas *evas = evas_object_evas_get(win->win_obj);
if (evas)
@ -491,7 +491,7 @@ _elm_win_client_message(void *data, int type __UNUSED__, void *event)
}
else if (e->message_type == ECORE_X_ATOM_E_COMP_DUMP)
{
if (e->data.l[0] == win->xwin)
if ((unsigned)e->data.l[0] == win->xwin)
{
Evas *evas = evas_object_evas_get(win->win_obj);
if (evas)