e: massiv warning cleanup !

SVN revision: 70756

src/bin/e.h

@@ -176,32 +176,32 @@ typedef struct _E_Rect E_Rect;
   while (0)
 
 # define E_CLAMP(x, min, max) (x < min ? min : (x > max ? max : x))
-# define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
-   { \
-      if (E_INTERSECTS(_x, _y, _w, _h, _cx, _cy, _cw, _ch)) \
-	{ \
-	   if (_x < (_cx)) \
-	     { \
-		_w += _x - (_cx); \
-		_x = (_cx); \
-		if ((int)_w < 0) _w = 0; \
-	     } \
-	   if ((_x + _w) > ((_cx) + (_cw))) \
-	     _w = (_cx) + (_cw) - _x; \
-	   if (_y < (_cy)) \
-	     { \
-		_h += _y - (_cy); \
-		_y = (_cy); \
-		if ((int)_h < 0) _h = 0; \
-	     } \
-	   if ((_y + _h) > ((_cy) + (_ch))) \
-	     _h = (_cy) + (_ch) - _y; \
-	} \
-      else \
-	{ \
-	   _w = 0; _h = 0; \
-	} \
-   }
+# define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch)	\
+  {									\
+    if (E_INTERSECTS(_x, _y, _w, _h, _cx, _cy, _cw, _ch))		\
+      {									\
+	if ((int) _x < (int)(_cx))					\
+	  {								\
+	    _w += _x - (_cx);						\
+	    _x = (_cx);							\
+	    if ((int)_w < 0) _w = 0;					\
+	  }								\
+	if ((int) (_x + _w) > (int) ((_cx) + (_cw)))			\
+	  _w = (_cx) + (_cw) - _x;					\
+	if ((int) _y < (int) (_cy))					\
+	  {								\
+	    _h += _y - (_cy);						\
+	    _y = (_cy);							\
+	    if ((int)_h < 0) _h = 0;					\
+	  }								\
+	if ((int) (_y + _h) > (int) ((_cy) + (_ch)))			\
+	  _h = (_cy) + (_ch) - _y;					\
+      }									\
+    else								\
+      {									\
+	_w = 0; _h = 0;							\
+      }									\
+  }
 
 # define E_REMOTE_OPTIONS 1
 # define E_REMOTE_OUT 2

src/bin/e_config.c

@@ -220,7 +220,7 @@ e_config_init(void)
 #define D _e_config_gadcon_edd
    E_CONFIG_VAL(D, T, name, STR);
    E_CONFIG_VAL(D, T, id, INT);
-   E_CONFIG_VAL(D, T, zone, INT);
+   E_CONFIG_VAL(D, T, zone, UINT);
    E_CONFIG_LIST(D, T, clients, _e_config_gadcon_client_edd);
 
    _e_config_shelf_desk_edd = E_CONFIG_DD_NEW("E_Config_Shelf_Desk", E_Config_Shelf_Desk);

src/bin/e_config.h

@@ -471,10 +471,10 @@ struct _E_Config_Desktop_Name
 
 struct _E_Config_Gadcon
 {
-   const char *name;
-   int         id;
-   int         zone;
-   Eina_List  *clients;
+   const char  *name;
+   int          id;
+   unsigned int zone;
+   Eina_List   *clients;
 };
 
 struct _E_Config_Gadcon_Client

src/bin/e_gadcon.h

@@ -318,25 +318,26 @@ EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu);
 #define GADCON_CLIENT_CONFIG_GET(_type, _items, _gc_class, _id)		\
   if (!_id)								\
     {									\
-       char buf[128];							\
-       int num = 0;							\
-       _type *ci;							\
+       char *_buf;							\
+       int _num = 0;							\
+       _type *_ci;							\
        if (_items)							\
 	 {								\
-	    const char *p;						\
-	    ci = eina_list_last(_items)->data;				\
-	    p = strrchr (ci->id, '.');					\
-	    if (p) num = atoi (p + 1) + 1;				\
+	    const char *_p;						\
+	    _ci = eina_list_last(_items)->data;				\
+	    _p = strrchr (_ci->id, '.');				\
+	    if (_p) _num = atoi (_p + 1) + 1;				\
 	 }								\
-       snprintf (buf, sizeof (buf), "%s.%d", _gc_class.name, num);	\
-       _id = buf;							\
+       _buf = alloca(sizeof (char) * ((_gc_class.name ? strlen( _gc_class.name) : 6) + 11)); \
+       sprintf (_buf, "%s.%d", _gc_class.name, _num);			\
+       _id = _buf;							\
     }									\
   else									\
     {									\
        Eina_List *l;							\
-       _type *ci;							\
-       EINA_LIST_FOREACH(_items, l, ci)					\
-	 if ((ci->id) && (!strcmp(ci->id, id))) return ci;		\
+       _type *_ci;							\
+       EINA_LIST_FOREACH(_items, l, _ci)				\
+	 if ((_ci->id) && (!strcmp(_ci->id, _id))) return _ci;	\
     }
 
 #endif

src/modules/backlight/e_mod_main.c

@@ -142,14 +142,12 @@ _backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event)
    else
      {
         Eina_List *l;
-        E_Config_Binding_Key *bind;
+        E_Config_Binding_Key *binding;
         E_Binding_Modifier mod;
-        
-        for (l = e_config->key_bindings; l; l = l->next)
+
+	EINA_LIST_FOREACH(e_config->key_bindings, l, binding)
           {
-             bind = l->data;
-             
-             if (bind->action && strcmp(bind->action, "backlight")) continue;
+             if (binding->action && strcmp(binding->action, "backlight")) continue;
              
              mod = 0;
              
@@ -162,8 +160,8 @@ _backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event)
              if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
                 mod |= E_BINDING_MODIFIER_WIN;
              
-             if (bind->key && (!strcmp(bind->key, ev->keyname)) &&
-                 ((bind->modifiers == (int)mod) || (bind->any_mod)))
+             if (binding->key && (!strcmp(binding->key, ev->keyname)) &&
+                 ((binding->modifiers == mod) || (binding->any_mod)))
                {
                   _backlight_popup_free(inst);
                   break;

src/modules/battery/batget.c

@@ -997,26 +997,25 @@ linux_acpi_cb_event_fd_active(void *data        __UNUSED__,
 static void
 linux_acpi_init(void)
 {
-   Eina_List *powers;
-   Eina_List *bats;
+   Eina_Iterator *powers;
+   Eina_Iterator *bats;
 
-   bats = ecore_file_ls("/proc/acpi/battery");
+   bats = eina_file_direct_ls("/proc/acpi/battery");
    if (bats)
      {
-        char *name;
+        Eina_File_Direct_Info *info;
 
         have_power = 0;
-        powers = ecore_file_ls("/proc/acpi/ac_adapter");
+        powers = eina_file_direct_ls("/proc/acpi/ac_adapter");
         if (powers)
           {
-             char *name;
-
-             EINA_LIST_FREE(powers, name)
+             EINA_ITERATOR_FOREACH(powers, info)
                {
                   char buf[4096];
                   FILE *f;
 
-                  snprintf(buf, sizeof(buf), "/proc/acpi/ac_adapter/%s/state", name);
+                  strcpy(buf, info->path);
+                  strcat(buf, "/state");
                   f = fopen(buf, "r");
                   if (f)
                     {
@@ -1030,21 +1029,22 @@ linux_acpi_init(void)
                             if (!strcmp(tmp, "on-line")) have_power = 1;
                             free(tmp);
                          }
+		       fclose(f);
                     }
-
-                  free(name);
                }
+             eina_iterator_free(powers);
           }
 
         have_battery = 0;
         acpi_max_full = 0;
         acpi_max_design = 0;
-        EINA_LIST_FREE(bats, name)
+        EINA_ITERATOR_FOREACH(bats, info)
           {
              char buf[4096];
              FILE *f;
 
-             snprintf(buf, sizeof(buf), "/proc/acpi/battery/%s/info", name);
+             strcpy(buf, info->path);
+             strcat(buf, "/info");
              f = fopen(buf, "r");
              if (f)
                {
@@ -1076,9 +1076,9 @@ linux_acpi_init(void)
                     }
                   fclose(f);
                }
-
-             free(name);
           }
+
+        eina_iterator_free(bats);
      }
    if (!acpid)
      {

src/modules/battery/e_mod_main.c

@@ -229,15 +229,15 @@ _battery_face_level_set(Evas_Object *battery, double level)
 }
 
 static void 
-_battery_face_time_set(Evas_Object *battery, int time)
+_battery_face_time_set(Evas_Object *battery, int t)
 {
    char buf[256];
    int hrs, mins;
 
-   if (time < 0) return;
+   if (t < 0) return;
 
-   hrs = (time / 3600);
-   mins = ((time) / 60 - (hrs * 60));
+   hrs = (t / 3600);
+   mins = ((t) / 60 - (hrs * 60));
    if (hrs < 0) hrs = 0;
    if (mins < 0) mins = 0;
    snprintf(buf, sizeof(buf), "%i:%02i", hrs, mins);
@@ -426,7 +426,7 @@ _battery_warning_popup_destroy(Instance *inst)
 }
 
 static void
-_battery_warning_popup(Instance *inst, int time, double percent)
+_battery_warning_popup(Instance *inst, int t, double percent)
 {
    Evas *e = NULL;
    Evas_Object *rect = NULL, *popup_bg = NULL;
@@ -499,7 +499,7 @@ _battery_warning_popup(Instance *inst, int time, double percent)
         evas_object_show(rect);
      }
 
-   _battery_face_time_set(inst->popup_battery, time);
+   _battery_face_time_set(inst->popup_battery, t);
    _battery_face_level_set(inst->popup_battery, percent);
    edje_object_signal_emit(inst->popup_battery, "e,state,discharging", "e");
 
@@ -513,7 +513,7 @@ _battery_warning_popup(Instance *inst, int time, double percent)
 }
 
 static Eina_Bool
-_powersave_cb_config_update(void *data, int type, void *event)
+_powersave_cb_config_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    if (!battery_config->have_battery)
      e_powersave_mode_set(E_POWERSAVE_MODE_LOW);

src/modules/battery/e_mod_udev.c

@@ -199,7 +199,7 @@ static void
 _battery_udev_battery_update(const char *syspath, Battery *bat)
 {
    const char *test;
-   double time, charge;
+   double t, charge;
    
    if (!bat)
      {
@@ -233,10 +233,10 @@ _battery_udev_battery_update(const char *syspath, Battery *bat)
 
         charge = strtod(test, NULL);
         eina_stringshare_del(test);
-        time = ecore_time_get();
+        t = ecore_time_get();
         if ((bat->got_prop) && (charge != bat->current_charge))
-          bat->charge_rate = ((charge - bat->current_charge) / (time - bat->last_update));
-        bat->last_update = time;
+          bat->charge_rate = ((charge - bat->current_charge) / (t - bat->last_update));
+        bat->last_update = t;
         bat->current_charge = charge;
         bat->percent = 100 * (bat->current_charge / bat->last_full_charge);
         if (bat->got_prop)

src/modules/comp/e_mod_comp.c

@@ -485,11 +485,11 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
                {
                   for (i = 0; i < cw->rects_num; i++)
                     {
-                       E_RECTS_CLIP_TO_RECT(cw->rects[i].x,
-                                            cw->rects[i].y,
-                                            cw->rects[i].width,
-                                            cw->rects[i].height,
-                                            0, 0, cw->w, cw->h);
+		      E_RECTS_CLIP_TO_RECT(cw->rects[i].x,
+					   cw->rects[i].y,
+					   cw->rects[i].width,
+					   cw->rects[i].height,
+					   0, 0, (int) cw->w, (int) cw->h);
                     }
                }
              if (!_e_mod_comp_win_shaped_check(cw, cw->rects, cw->rects_num))
@@ -1810,7 +1810,7 @@ _e_mod_comp_win_add(E_Comp        *c,
 	     for (i = 0; i < num; i++)
 	       E_RECTS_CLIP_TO_RECT(rects[i].x, rects[i].y,
 				    rects[i].width, rects[i].height,
-				    0, 0, att.w, att.h);
+				    0, 0, (int) att.w, (int) att.h);
 
              if (_e_mod_comp_shaped_check(att.w, att.h, rects, num))
 	       cw->shape_changed = 1;
@@ -2648,7 +2648,7 @@ _e_mod_comp_message(void *data __UNUSED__,
    
    if (ev->message_type == ECORE_X_ATOM_NET_WM_WINDOW_OPACITY)
      {
-        E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
+        cw = _e_mod_comp_win_find(ev->win);
         if (!cw) return ECORE_CALLBACK_PASS_ON;
         _e_mod_comp_win_opacity_set(cw);
         return ECORE_CALLBACK_PASS_ON;

src/modules/conf_applications/e_int_config_defapps.c

@@ -432,8 +432,8 @@ _load_mimes(E_Config_Dialog_Data *cfdata, char *file)
    FILE *f;
    char buf[4096], mimetype[4096], ext[4096];
    char *p, *pp;
-   Config_Mime *mime;
-   Config_Glob *glob;
+   Config_Mime *config_mime;
+   Config_Glob *config_glob;
    
    if (!cfdata) return;
    
@@ -458,32 +458,32 @@ _load_mimes(E_Config_Dialog_Data *cfdata, char *file)
              while (!isblank(*p) && (*p != 0) && (*p != '\n')) p++;
              strncpy(ext, pp, (p - pp));
              ext[p - pp] = 0;
-             mime = _find_mime(cfdata, mimetype);
-             if (!mime)
+             config_mime = _find_mime(cfdata, mimetype);
+             if (!config_mime)
                {
-                  mime = E_NEW(Config_Mime, 1);
-                  if (mime)
+                  config_mime = E_NEW(Config_Mime, 1);
+                  if (config_mime)
                     {
-                       mime->mime = eina_stringshare_add(mimetype);
-                       if (!mime->mime)
-                          free(mime);
+                       config_mime->mime = eina_stringshare_add(mimetype);
+                       if (!config_mime->mime)
+                          free(config_mime);
                        else
                          {
-                            glob = E_NEW(Config_Glob, 1);
-                            glob->name = eina_stringshare_add(ext);
-                            mime->globs = eina_list_append(mime->globs, glob);
-                            cfdata->mimes = eina_list_append(cfdata->mimes, mime);
+                            config_glob = E_NEW(Config_Glob, 1);
+                            config_glob->name = eina_stringshare_add(ext);
+                            config_mime->globs = eina_list_append(config_mime->globs, config_glob);
+                            cfdata->mimes = eina_list_append(cfdata->mimes, config_mime);
                          }
                     }
                }
              else
                {
-                  glob = _find_glob(mime, ext);
-                  if (!glob)
+                  config_glob = _find_glob(config_mime, ext);
+                  if (!config_glob)
                     {
-                       glob = E_NEW(Config_Glob, 1);
-                       glob->name = eina_stringshare_add(ext);
-                       mime->globs = eina_list_append(mime->globs, glob);
+                       config_glob = E_NEW(Config_Glob, 1);
+                       config_glob->name = eina_stringshare_add(ext);
+                       config_mime->globs = eina_list_append(config_mime->globs, config_glob);
                     }
                }
           }
@@ -498,8 +498,8 @@ _load_globs(E_Config_Dialog_Data *cfdata, char *file)
    FILE *f;
    char buf[4096], mimetype[4096], ext[4096];
    char *p, *pp;
-   Config_Mime *mime;
-   Config_Glob *glob;
+   Config_Mime *config_mime;
+   Config_Glob *config_glob;
    
    if (!cfdata) return;
    
@@ -525,32 +525,32 @@ _load_globs(E_Config_Dialog_Data *cfdata, char *file)
              p++;
           }
         *pp = 0;
-        mime = _find_mime(cfdata, mimetype);
-        if (!mime)
+        config_mime = _find_mime(cfdata, mimetype);
+        if (!config_mime)
           {
-             mime = E_NEW(Config_Mime, 1);
-             if (mime)
+             config_mime = E_NEW(Config_Mime, 1);
+             if (config_mime)
                {
-                  mime->mime = eina_stringshare_add(mimetype);
-                  if (!mime->mime)
-                     free(mime);
+                  config_mime->mime = eina_stringshare_add(mimetype);
+                  if (!config_mime->mime)
+                     free(config_mime);
                   else
                     {
-                       glob = E_NEW(Config_Glob, 1);
-                       glob->name = eina_stringshare_add(ext);
-                       mime->globs = eina_list_append(mime->globs, glob);
-                       cfdata->mimes = eina_list_append(cfdata->mimes, mime);
+                       config_glob = E_NEW(Config_Glob, 1);
+                       config_glob->name = eina_stringshare_add(ext);
+                       config_mime->globs = eina_list_append(config_mime->globs, config_glob);
+                       cfdata->mimes = eina_list_append(cfdata->mimes, config_mime);
                     }
                }
           }
         else
           {
-             glob = _find_glob(mime, ext);
-             if (!glob)
+             config_glob = _find_glob(config_mime, ext);
+             if (!config_glob)
                {
-                  glob = E_NEW(Config_Glob, 1);
-                  glob->name = eina_stringshare_add(ext);
-                  mime->globs = eina_list_append(mime->globs, glob);
+                  config_glob = E_NEW(Config_Glob, 1);
+                  config_glob->name = eina_stringshare_add(ext);
+                  config_mime->globs = eina_list_append(config_mime->globs, config_glob);
                }
           }
      }
@@ -582,7 +582,7 @@ _find_mime(E_Config_Dialog_Data *cfdata, char *mime)
 }
 
 static Config_Glob *
-_find_glob(Config_Mime *mime, char *glob)
+_find_glob(Config_Mime *mime, char *globbing)
 {
    Config_Glob *g;
    Eina_List *l;
@@ -591,7 +591,7 @@ _find_glob(Config_Mime *mime, char *glob)
    EINA_LIST_FOREACH(mime->globs, l, g)
      {
         if (!g) continue;
-        if (strcmp(g->name, glob)) continue;
+        if (strcmp(g->name, globbing)) continue;
         return g;
      }
    return NULL;

src/modules/conf_display/e_int_config_desklock_fsel.c

@@ -131,17 +131,17 @@ _cb_sel_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
    E_Config_Dialog_Data *cfdata;
    Eina_List *sel;
    E_Fm2_Icon_Info *ici;
-   const char *realpath;
+   const char *real_path;
    char buff[PATH_MAX];
 
    if (!(cfdata = data)) return;
    if (!(sel = e_widget_flist_selected_list_get(cfdata->o_list))) return;
    ici = sel->data;
-   realpath = e_widget_flist_real_path_get(cfdata->o_list);
-   if (!strcmp(realpath, "/"))
+   real_path = e_widget_flist_real_path_get(cfdata->o_list);
+   if (!strcmp(real_path, "/"))
      snprintf(buff, sizeof(buff), "/%s", ici->file);
    else
-     snprintf(buff, sizeof(buff), "%s/%s", realpath, ici->file);
+     snprintf(buff, sizeof(buff), "%s/%s", real_path, ici->file);
    eina_list_free(sel);
    if (ecore_file_is_dir(buff)) return;
    E_FREE(cfdata->bg);

src/modules/conf_edgebindings/e_int_config_edgebindings.c

@@ -1,3 +1,4 @@
+
 #include "e.h"
 
 #define TEXT_NONE_ACTION_EDGE _("<None>")
@@ -1049,7 +1050,6 @@ _edge_grab_wnd_selection_apply(E_Config_Dialog_Data *cfdata)
 {
    E_Config_Binding_Edge *bi = NULL, *bi2 = NULL;
    Eina_List *l;
-   char *label;
    int found = 0, n = -1;
 
 
@@ -1147,7 +1147,9 @@ _edge_grab_wnd_selection_apply(E_Config_Dialog_Data *cfdata)
 	  }
 	else if (bi)
 	  {
-	     label = _edge_binding_text_get(bi->edge, bi->delay, bi->modifiers);
+             char *label;
+
+             label = _edge_binding_text_get(bi->edge, bi->delay, bi->modifiers);
 	     e_widget_ilist_nth_label_set(cfdata->gui.o_binding_list, n, label);
 	     free(label);
 	  }

src/modules/conf_intl/e_int_config_imc.c

@@ -547,7 +547,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_
    E_Config_Dialog_Data *cfdata;
    Eina_List *selected;
    E_Fm2_Icon_Info *ici;
-   const char *realpath;
+   const char *real_path;
    char buf[PATH_MAX];
 
    cfdata = data;
@@ -562,11 +562,11 @@ _cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_
      }
 
    ici = selected->data;
-   realpath = e_fm2_real_path_get(cfdata->o_fm);
-   if (!strcmp(realpath, "/"))
+   real_path = e_fm2_real_path_get(cfdata->o_fm);
+   if (!strcmp(real_path, "/"))
      snprintf(buf, sizeof(buf), "/%s", ici->file);
    else
-     snprintf(buf, sizeof(buf), "%s/%s", realpath, ici->file);
+     snprintf(buf, sizeof(buf), "%s/%s", real_path, ici->file);
    eina_list_free(selected);
    if (ecore_file_is_dir(buf)) return;
    cfdata->imc_current = eina_stringshare_add(buf);

src/modules/conf_keybindings/e_int_config_acpibindings.c

@@ -92,18 +92,18 @@ static void
 _fill_data(E_Config_Dialog_Data *cfdata)
 {
    Eina_List *l;
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
 
-   EINA_LIST_FOREACH(e_config->acpi_bindings, l, bind)
+   EINA_LIST_FOREACH(e_config->acpi_bindings, l, binding)
      {
         E_Config_Binding_Acpi *b2;
 
         b2 = E_NEW(E_Config_Binding_Acpi, 1);
-        b2->context = bind->context;
-        b2->type = bind->type;
-        b2->status = bind->status;
-        b2->action = eina_stringshare_ref(bind->action);
-        b2->params = eina_stringshare_ref(bind->params);
+        b2->context = binding->context;
+        b2->type = binding->type;
+        b2->status = binding->status;
+        b2->action = eina_stringshare_ref(binding->action);
+        b2->params = eina_stringshare_ref(binding->params);
         cfdata->bindings = eina_list_append(cfdata->bindings, b2);
      }
 }
@@ -112,14 +112,14 @@ static void
 _free_data(E_Config_Dialog *cfd  __UNUSED__,
            E_Config_Dialog_Data *cfdata)
 {
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
    Ecore_Event_Handler *hdl;
 
-   EINA_LIST_FREE(cfdata->bindings, bind)
+   EINA_LIST_FREE(cfdata->bindings, binding)
      {
-        if (bind->action) eina_stringshare_del(bind->action);
-        if (bind->params) eina_stringshare_del(bind->params);
-        E_FREE(bind);
+        if (binding->action) eina_stringshare_del(binding->action);
+        if (binding->params) eina_stringshare_del(binding->params);
+        E_FREE(binding);
      }
 
    /* free the handlers */
@@ -147,26 +147,26 @@ static int
 _basic_apply(E_Config_Dialog *cfd  __UNUSED__,
              E_Config_Dialog_Data *cfdata)
 {
-   E_Config_Binding_Acpi *bind, *b2;
+   E_Config_Binding_Acpi *binding, *b2;
    Eina_List *l;
 
-   EINA_LIST_FREE(e_config->acpi_bindings, bind)
+   EINA_LIST_FREE(e_config->acpi_bindings, binding)
      {
-        e_bindings_acpi_del(bind->context, bind->type, bind->status,
-                            bind->action, bind->params);
-        if (bind->action) eina_stringshare_del(bind->action);
-        if (bind->params) eina_stringshare_del(bind->params);
-        E_FREE(bind);
+        e_bindings_acpi_del(binding->context, binding->type, binding->status,
+                            binding->action, binding->params);
+        if (binding->action) eina_stringshare_del(binding->action);
+        if (binding->params) eina_stringshare_del(binding->params);
+        E_FREE(binding);
      }
 
-   EINA_LIST_FOREACH(cfdata->bindings, l, bind)
+   EINA_LIST_FOREACH(cfdata->bindings, l, binding)
      {
         b2 = E_NEW(E_Config_Binding_Acpi, 1);
-        b2->context = bind->context;
-        b2->type = bind->type;
-        b2->status = bind->status;
-        b2->action = eina_stringshare_ref(bind->action);
-        b2->params = eina_stringshare_ref(bind->params);
+        b2->context = binding->context;
+        b2->type = binding->type;
+        b2->status = binding->status;
+        b2->action = eina_stringshare_ref(binding->action);
+        b2->params = eina_stringshare_ref(binding->params);
         e_config->acpi_bindings =
           eina_list_append(e_config->acpi_bindings, b2);
 
@@ -230,7 +230,7 @@ _fill_bindings(E_Config_Dialog_Data *cfdata)
 {
    Evas *evas;
    Eina_List *l;
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
    int i = -1, mw;
 
    evas = evas_object_evas_get(cfdata->o_bindings);
@@ -239,7 +239,7 @@ _fill_bindings(E_Config_Dialog_Data *cfdata)
    e_widget_ilist_freeze(cfdata->o_bindings);
    e_widget_ilist_clear(cfdata->o_bindings);
 
-   EINA_LIST_FOREACH(cfdata->bindings, l, bind)
+   EINA_LIST_FOREACH(cfdata->bindings, l, binding)
      {
         const char *lbl;
         char buff[32];
@@ -247,7 +247,7 @@ _fill_bindings(E_Config_Dialog_Data *cfdata)
         i++;
         snprintf(buff, sizeof(buff), "%d", i);
 
-        lbl = _binding_label_get(bind);
+        lbl = _binding_label_get(binding);
 
         e_widget_ilist_append(cfdata->o_bindings, NULL, lbl,
                                 _cb_bindings_changed, cfdata, buff);
@@ -301,12 +301,12 @@ _fill_actions(E_Config_Dialog_Data *cfdata)
 static E_Config_Binding_Acpi *
 _selected_binding_get(E_Config_Dialog_Data *cfdata)
 {
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
 
    if ((!cfdata) || (!cfdata->bindex)) return NULL;
-   if (!(bind = eina_list_nth(cfdata->bindings, atoi(cfdata->bindex))))
+   if (!(binding = eina_list_nth(cfdata->bindings, atoi(cfdata->bindex))))
      return NULL;
-   return bind;
+   return binding;
 }
 
 static E_Action_Description *
@@ -341,55 +341,55 @@ _selected_action_get(E_Config_Dialog_Data *cfdata)
 }
 
 static const char *
-_binding_label_get(E_Config_Binding_Acpi *bind)
+_binding_label_get(E_Config_Binding_Acpi *binding)
 {
-   if (bind->type == E_ACPI_TYPE_UNKNOWN) return NULL;
-   if (bind->type == E_ACPI_TYPE_AC_ADAPTER)
+   if (binding->type == E_ACPI_TYPE_UNKNOWN) return NULL;
+   if (binding->type == E_ACPI_TYPE_AC_ADAPTER)
      {
-        if (bind->status == 0) return _("AC Adapter Unplugged");
-        if (bind->status == 1) return _("AC Adapter Plugged");
+        if (binding->status == 0) return _("AC Adapter Unplugged");
+        if (binding->status == 1) return _("AC Adapter Plugged");
         return _("Ac Adapter");
      }
-   if (bind->type == E_ACPI_TYPE_BATTERY)
+   if (binding->type == E_ACPI_TYPE_BATTERY)
      return _("Battery");
-   if (bind->type == E_ACPI_TYPE_BUTTON)
+   if (binding->type == E_ACPI_TYPE_BUTTON)
      return _("Button");
-   if (bind->type == E_ACPI_TYPE_FAN)
+   if (binding->type == E_ACPI_TYPE_FAN)
      return _("Fan");
-   if (bind->type == E_ACPI_TYPE_LID)
+   if (binding->type == E_ACPI_TYPE_LID)
      {
-        if (bind->status == E_ACPI_LID_UNKNOWN) return _("Lid Unknown");
-        if (bind->status == E_ACPI_LID_CLOSED) return _("Lid Closed");
-        if (bind->status == E_ACPI_LID_OPEN) return _("Lid Opened");
+        if (binding->status == E_ACPI_LID_UNKNOWN) return _("Lid Unknown");
+        if (binding->status == E_ACPI_LID_CLOSED) return _("Lid Closed");
+        if (binding->status == E_ACPI_LID_OPEN) return _("Lid Opened");
         return _("Lid");
      }
-   if (bind->type == E_ACPI_TYPE_POWER)
+   if (binding->type == E_ACPI_TYPE_POWER)
      return _("Power Button");
-   if (bind->type == E_ACPI_TYPE_PROCESSOR)
+   if (binding->type == E_ACPI_TYPE_PROCESSOR)
      return _("Processor");
-   if (bind->type == E_ACPI_TYPE_SLEEP)
+   if (binding->type == E_ACPI_TYPE_SLEEP)
      return _("Sleep Button");
-   if (bind->type == E_ACPI_TYPE_THERMAL)
+   if (binding->type == E_ACPI_TYPE_THERMAL)
      return _("Thermal");
-   if (bind->type == E_ACPI_TYPE_VIDEO)
+   if (binding->type == E_ACPI_TYPE_VIDEO)
      return _("Video");
-   if (bind->type == E_ACPI_TYPE_WIFI)
+   if (binding->type == E_ACPI_TYPE_WIFI)
      return _("Wifi");
-   if (bind->type == E_ACPI_TYPE_HIBERNATE)
+   if (binding->type == E_ACPI_TYPE_HIBERNATE)
      return _("Hibernate");
-   if (bind->type == E_ACPI_TYPE_ZOOM_OUT)
+   if (binding->type == E_ACPI_TYPE_ZOOM_OUT)
      return _("Zoom Out");
-   if (bind->type == E_ACPI_TYPE_ZOOM_IN)
+   if (binding->type == E_ACPI_TYPE_ZOOM_IN)
      return _("Zoom In");
-   if (bind->type == E_ACPI_TYPE_BRIGHTNESS_DOWN)
+   if (binding->type == E_ACPI_TYPE_BRIGHTNESS_DOWN)
      return _("Brightness Down");
-   if (bind->type == E_ACPI_TYPE_BRIGHTNESS_UP)
+   if (binding->type == E_ACPI_TYPE_BRIGHTNESS_UP)
      return _("Brightness Up");
-   if (bind->type == E_ACPI_TYPE_ASSIST)
+   if (binding->type == E_ACPI_TYPE_ASSIST)
      return _("Assist");
-   if (bind->type == E_ACPI_TYPE_S1)
+   if (binding->type == E_ACPI_TYPE_S1)
      return _("S1");
-   if (bind->type == E_ACPI_TYPE_VAIO)
+   if (binding->type == E_ACPI_TYPE_VAIO)
      return _("Vaio");
 
    return _("Unknown");
@@ -399,14 +399,14 @@ static void
 _cb_bindings_changed(void *data)
 {
    E_Config_Dialog_Data *cfdata;
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
    Eina_List *items;
    const E_Ilist_Item *item;
    int i = -1;
 
    if (!(cfdata = data)) return;
    e_widget_entry_clear(cfdata->o_params);
-   if (!(bind = _selected_binding_get(cfdata)))
+   if (!(binding = _selected_binding_get(cfdata)))
      {
         e_widget_disabled_set(cfdata->o_params, EINA_TRUE);
         e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
@@ -422,7 +422,7 @@ _cb_bindings_changed(void *data)
 
         i++;
         if (!(val = e_widget_ilist_item_value_get(item))) continue;
-        if (strcmp(val, bind->action)) continue;
+        if (strcmp(val, binding->action)) continue;
         e_widget_ilist_selected_set(cfdata->o_actions, i);
         break;
      }
@@ -432,12 +432,12 @@ static void
 _cb_actions_changed(void *data)
 {
    E_Config_Dialog_Data *cfdata;
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
    E_Action_Description *dsc;
 
    if (!(cfdata = data)) return;
    e_widget_entry_clear(cfdata->o_params);
-   if (!(bind = _selected_binding_get(cfdata)))
+   if (!(binding = _selected_binding_get(cfdata)))
      {
         e_widget_disabled_set(cfdata->o_params, EINA_TRUE);
         e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
@@ -449,13 +449,13 @@ _cb_actions_changed(void *data)
         return;
      }
 
-   eina_stringshare_replace(&bind->action, dsc->act_cmd);
+   eina_stringshare_replace(&binding->action, dsc->act_cmd);
    e_widget_disabled_set(cfdata->o_params, !(dsc->editable));
 
    if ((!dsc->editable) && (dsc->act_params))
      e_widget_entry_text_set(cfdata->o_params, dsc->act_params);
-   else if (bind->params)
-     e_widget_entry_text_set(cfdata->o_params, bind->params);
+   else if (binding->params)
+     e_widget_entry_text_set(cfdata->o_params, binding->params);
    else
      {
         if ((!dsc->param_example) || (!dsc->param_example[0]))
@@ -470,14 +470,14 @@ _cb_entry_changed(void       *data,
                   void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
    E_Action_Description *dsc;
 
    if (!(cfdata = data)) return;
    if (!(dsc = _selected_action_get(cfdata))) return;
    if (!dsc->editable) return;
-   if (!(bind = _selected_binding_get(cfdata))) return;
-   eina_stringshare_replace(&bind->params,
+   if (!(binding = _selected_binding_get(cfdata))) return;
+   eina_stringshare_replace(&binding->params,
                             e_widget_entry_text_get(cfdata->o_params));
 }
 
@@ -528,22 +528,22 @@ _cb_del_binding(void       *data,
                 void *data2 __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
-   E_Config_Binding_Acpi *bind, *bind2;
+   E_Config_Binding_Acpi *binding, *bind2;
    Eina_List *l;
 
    if (!(cfdata = data)) return;
-   if (!(bind = _selected_binding_get(cfdata))) return;
+   if (!(binding = _selected_binding_get(cfdata))) return;
 
    /* delete from e_config */
    EINA_LIST_FOREACH(e_config->acpi_bindings, l, bind2)
      {
-        if ((bind->context == bind2->context) && (bind->type == bind2->type) &&
-            (((bind->action) && (bind2->action) &&
-              (!strcmp(bind->action, bind2->action))) ||
-             ((!bind->action) && (!bind2->action))) &&
-            (((bind->params) && (bind2->params) &&
-              (!strcmp(bind->params, bind2->params))) ||
-             ((!bind->params) && (!bind2->params))))
+        if ((binding->context == bind2->context) && (binding->type == bind2->type) &&
+            (((binding->action) && (bind2->action) &&
+              (!strcmp(binding->action, bind2->action))) ||
+             ((!binding->action) && (!bind2->action))) &&
+            (((binding->params) && (bind2->params) &&
+              (!strcmp(binding->params, bind2->params))) ||
+             ((!binding->params) && (!bind2->params))))
           {
              if (bind2->action) eina_stringshare_del(bind2->action);
              if (bind2->params) eina_stringshare_del(bind2->params);
@@ -556,19 +556,19 @@ _cb_del_binding(void       *data,
      }
 
    /* delete from e_bindings */
-   e_bindings_acpi_del(bind->context, bind->type, bind->status,
-                       bind->action, bind->params);
+   e_bindings_acpi_del(binding->context, binding->type, binding->status,
+                       binding->action, binding->params);
 
    /* delete from dialog list */
    EINA_LIST_FOREACH(cfdata->bindings, l, bind2)
      {
-        if ((bind->context == bind2->context) && (bind->type == bind2->type) &&
-            (((bind->action) && (bind2->action) &&
-              (!strcmp(bind->action, bind2->action))) ||
-             ((!bind->action) && (!bind2->action))) &&
-            (((bind->params) && (bind2->params) &&
-              (!strcmp(bind->params, bind2->params))) ||
-             ((!bind->params) && (!bind2->params))))
+        if ((binding->context == bind2->context) && (binding->type == bind2->type) &&
+            (((binding->action) && (bind2->action) &&
+              (!strcmp(binding->action, bind2->action))) ||
+             ((!binding->action) && (!bind2->action))) &&
+            (((binding->params) && (bind2->params) &&
+              (!strcmp(binding->params, bind2->params))) ||
+             ((!binding->params) && (!bind2->params))))
           {
              if (bind2->action) eina_stringshare_del(bind2->action);
              if (bind2->params) eina_stringshare_del(bind2->params);
@@ -625,7 +625,7 @@ _cb_acpi_event(void          *data,
 {
    E_Event_Acpi *ev;
    E_Config_Dialog_Data *cfdata;
-   E_Config_Binding_Acpi *bind;
+   E_Config_Binding_Acpi *binding;
    Ecore_Event_Handler *hdl;
 
    ev = event;
@@ -646,12 +646,12 @@ _cb_acpi_event(void          *data,
    e_acpi_events_thaw();
 
    /* NB: This may need more testing/parsing for event status */
-   bind = E_NEW(E_Config_Binding_Acpi, 1);
-   bind->context = E_BINDING_CONTEXT_NONE;
-   bind->type = ev->type;
-   bind->status = ev->status;
-   bind->action = eina_stringshare_add("dim_screen");
-   bind->params = NULL;
+   binding = E_NEW(E_Config_Binding_Acpi, 1);
+   binding->context = E_BINDING_CONTEXT_NONE;
+   binding->type = ev->type;
+   binding->status = ev->status;
+   binding->action = eina_stringshare_add("dim_screen");
+   binding->params = NULL;
 
    cfdata->bindings = eina_list_append(cfdata->bindings, bind);
    _fill_bindings(cfdata);

src/modules/conf_performance/e_int_config_powermanagement.c

@@ -19,8 +19,8 @@ struct _E_Config_Dialog_Data
    double powersave_medium;
    double powersave_high;
    double powersave_extreme;
-   int powersave_min;
-   int powersave_max;
+   E_Powersave_Mode powersave_min;
+   E_Powersave_Mode powersave_max;
 };
 
 E_Config_Dialog *
@@ -110,8 +110,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
    cfdata->powersave_min = e_config->powersave.min;
    cfdata->powersave_max = e_config->powersave.max;
-   rmin = e_widget_radio_group_new(&(cfdata->powersave_min));
-   rmax = e_widget_radio_group_new(&(cfdata->powersave_max));
+   rmin = e_widget_radio_group_new((int*) &(cfdata->powersave_min));
+   rmax = e_widget_radio_group_new((int*) &(cfdata->powersave_max));
 
    ol = e_widget_table_add(evas, 0);
    ob = e_widget_label_add(evas, _("Min"));
@@ -360,7 +360,7 @@ _cb_max_changed(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
    Evas_Object *o;
-   int toggle;
+
    cfdata = data;
    if (!cfdata) return;
    if (cfdata->powersave_min > cfdata->powersave_max)

src/modules/conf_randr/e_int_config_randr_arrangement.c

@@ -165,7 +165,7 @@ arrangement_widget_rep_update(E_Config_Randr_Dialog_Output_Dialog_Data *odd)
 
    if (odd->crtc)
      {
-        orientation = (odd->new_orientation != Ecore_X_Randr_Unset) ? odd->new_orientation : odd->previous_orientation;
+       orientation = (odd->new_orientation != (Ecore_X_Randr_Orientation) Ecore_X_Randr_Unset) ? odd->new_orientation : odd->previous_orientation;
      }
    switch (orientation)
      {

src/modules/conf_randr/e_int_config_randr_orientation.c

@@ -31,7 +31,7 @@ orientation_widget_create_data(E_Config_Dialog_Data *cfdata)
    EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
      {
         odd->new_orientation = Ecore_X_Randr_Unset;
-        odd->previous_orientation = odd->crtc ? odd->crtc->current_orientation : Ecore_X_Randr_Unset;
+        odd->previous_orientation = odd->crtc ? odd->crtc->current_orientation : (Ecore_X_Randr_Orientation) Ecore_X_Randr_Unset;
      }
 
    return EINA_TRUE;
@@ -169,7 +169,7 @@ orientation_widget_update_radio_buttons(E_Config_Randr_Dialog_Output_Dialog_Data
      {
         //enabled monitor
         supported_oris = odd->crtc->orientations;
-        ori = (odd->new_orientation != Ecore_X_Randr_Unset) ? odd->new_orientation : odd->crtc->current_orientation;
+        ori = (odd->new_orientation != (Ecore_X_Randr_Orientation) Ecore_X_Randr_Unset) ? odd->new_orientation : odd->crtc->current_orientation;
      }
    else
      {

src/modules/conf_randr/e_int_config_randr_policy.c

@@ -54,11 +54,11 @@ policy_widget_create_data(E_Config_Dialog_Data *data)
         else
           oi = odd->output;
 
-        odd->previous_policy = oi ? oi->policy : Ecore_X_Randr_Unset;
+        odd->previous_policy = oi ? oi->policy : (Ecore_X_Randr_Orientation) Ecore_X_Randr_Unset;
         odd->new_policy = Ecore_X_Randr_Unset;
         if (!oi) //Not of interest for dbg output
           continue;
-        fprintf(stderr, "CONF_RANDR: Read in policy of %d as %s.\n", oi->xid, ((odd->previous_policy != Ecore_X_Randr_Unset) ? _POLICIES_STRINGS[odd->previous_policy - 1] : "unset"));
+        fprintf(stderr, "CONF_RANDR: Read in policy of %d as %s.\n", oi->xid, ((odd->previous_policy != (Ecore_X_Randr_Output_Policy) Ecore_X_Randr_Unset) ? _POLICIES_STRINGS[odd->previous_policy - 1] : "unset"));
      }
 
    return EINA_TRUE;
@@ -210,14 +210,14 @@ policy_widget_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_
 
    EINA_LIST_FOREACH(cfdata->output_dialog_data_list, it, odd)
      {
-        if (odd->new_policy == Ecore_X_Randr_Unset)
+       if (odd->new_policy == (Ecore_X_Randr_Output_Policy) Ecore_X_Randr_Unset)
           continue;
         if (odd->crtc)
           {
              EINA_LIST_FOREACH(odd->crtc->outputs, it2, oi)
                {
                   oi->policy = odd->new_policy;
-		  fprintf(stderr, "CONF_RANDR: 'New display attached'-policy for output %d set to %s.\n", odd->output ? odd->output->xid : NULL, _POLICIES_STRINGS[odd->new_policy - 1]);
+		  fprintf(stderr, "CONF_RANDR: 'New display attached'-policy for output %d set to %s.\n", odd->output ? odd->output->xid : 0, _POLICIES_STRINGS[odd->new_policy - 1]);
                }
           }
         else if (odd->output)
@@ -240,7 +240,8 @@ policy_widget_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dial
 
    EINA_LIST_FOREACH(cfdata->output_dialog_data_list, it, odd)
      {
-        if ((odd->new_policy == Ecore_X_Randr_Unset) || (odd->previous_policy == Ecore_X_Randr_Unset))
+        if ((odd->new_policy == (Ecore_X_Randr_Output_Policy) Ecore_X_Randr_Unset) ||
+            (odd->previous_policy == (Ecore_X_Randr_Output_Policy) Ecore_X_Randr_Unset))
           continue;
         if (odd->new_policy != odd->previous_policy)
           return EINA_TRUE;
@@ -276,7 +277,7 @@ policy_widget_update_radio_buttons(E_Config_Randr_Dialog_Output_Dialog_Data *odd
         e_widget_disabled_set(e_config_runtime_info->gui.widgets.policy.radio_none, EINA_FALSE);
      }
 
-   policy = (odd->new_policy != Ecore_X_Randr_Unset) ? odd->new_policy : odd->previous_policy;
+   policy = (odd->new_policy != (Ecore_X_Randr_Output_Policy) Ecore_X_Randr_Unset) ? odd->new_policy : odd->previous_policy;
    //toggle the switch of the currently used policies
    switch (policy)
      {

src/modules/conf_theme/e_int_config_fonts.c

@@ -1002,11 +1002,12 @@ _size_list_load(E_Config_Dialog_Data *cfdata, Eina_List *size_list, Evas_Font_Si
 static void
 _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
 {
-   int n;
+   const char *f;
    Eina_List *next;
    Evas_Object *ob;
    Evas *evas;
    Evas_Coord w;
+   int n;
 
    ob = cfdata->gui.font_list;
    evas = evas_object_evas_get(ob);
@@ -1036,13 +1037,8 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
    /* Load the list */
    if (cfdata->font_list)
      {
-	Eina_List *next;
-
-	for (next = cfdata->font_list; next; next = next->next)
+        EINA_LIST_FOREACH(cfdata->font_list, next, f)
 	  {
-	     const char *f;
-
-	     f = next->data;
 	     e_widget_ilist_append(ob, NULL, f, NULL, NULL, f);
 	  }
      }
@@ -1058,11 +1054,8 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
 
    /* Select Current Font */
    n = 0;
-   for (next = cfdata->font_list; next; next = next->next)
+   EINA_LIST_FOREACH(cfdata->font_list, next, f)
      {
-	const char *f;
-
-	f = next->data;
 	if (!strcasecmp(f, cur_font))
 	  {
 	     e_widget_ilist_selected_set(ob, n);
@@ -1076,23 +1069,25 @@ static void
 _adv_style_cb_change(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
+   E_Ilist_Item *i;
    Eina_List *l;
-   int n;
+   int n = 0;
 
    if (!(cfdata = data)) return;
 
    /* Setup the new style name */
-   for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next,