e: Cleanup

Removes unused variables, drops duplicate return or break
     statements and drops unnecessary checks.

Patch by Igor Murzov

SVN revision: 77490

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index d091a1904150c6b9e68c218260b4e22f3fd71cc6..14f4378bde674d51185cb891b9e5b546b693f1e5 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1296,7 +1296,6 @@ _e_zone_useful_geometry_calc(E_Zone *zone)
               if (yy1 > zone->h - shelf->h)
                 yy1 = zone->h - shelf->h;
               break;
-              break;
 
             case E_GADCON_ORIENT_LEFT:
             case E_GADCON_ORIENT_CORNER_LT:

diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
index 538b74ccbf4d1bda7ab0989784e56a7609603a43..94430cd0d59e49aa4e89767def07b4acb4febba9 100644 (file)
--- a/src/modules/battery/batget.c
+++ b/src/modules/battery/batget.c
@@ -272,8 +272,6 @@ static void
 bsd_apm_check(void)
 {
    int ac_stat, bat_stat, bat_val, time_val;
-   char buf[4096];
-   int hours, minutes;
    int apm_fd = -1;
    struct apm_info info;
 
@@ -357,7 +355,6 @@ darwin_check(void)
    const void *values;
    int device_num, device_count;
    int currentval = 0, maxval = 0;
-   char buf[4096];
    CFTypeRef blob;
    CFArrayRef sources;
    CFDictionaryRef device_dict;

diff --git a/src/modules/conf_theme/e_int_config_scale.c b/src/modules/conf_theme/e_int_config_scale.c
index 7c19a8ee650a3ed3b733010a77a491e37b1963b0..50d2f26c01a0be3ec1f4893dca2c8c1eb3b6b7db 100644 (file)
--- a/src/modules/conf_theme/e_int_config_scale.c
+++ b/src/modules/conf_theme/e_int_config_scale.c
@@ -386,7 +386,6 @@ _adv_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
           (cfdata->max != e_config->scale.max) ||
           (cfdata->factor != e_config->scale.factor) ||
           (cfdata->base_dpi != e_config->scale.base_dpi);
-   return 1;
 }
 
 static void

diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index 31b11e22ba87a7cb4445f50ae3d28e61ff4c62a7..870520dd2179737a14814ccada0f5c0ebb3d42f2 100644 (file)
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -597,7 +597,7 @@ _cpufreq_status_check_available(Status *s)
 #elif defined (__FreeBSD__)
    int freq;
    size_t len = sizeof(buf);
-   char *freqs, *pos, *q;
+   char *pos, *q;
 
    /* read freq_levels sysctl and store it in freq */
    if (sysctlbyname("dev.cpu.0.freq_levels", buf, &len, NULL, 0) == 0)

diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c
index 1a474b94e6b56c11b63eb2041bbc34e008c81b25..54f973f76f0bdca7ec8061d38ef280df5a86c51d 100644 (file)
--- a/src/modules/fileman/e_mod_menu.c
+++ b/src/modules/fileman/e_mod_menu.c
@@ -274,7 +274,7 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu   *m,
              e_menu_item_callback_set(mi, _e_mod_menu_gtk_cb,
                                       (void *)eina_stringshare_add(uri->path));
              e_menu_item_submenu_pre_callback_set(mi, _e_mod_menu_populate, eina_stringshare_add("/"));
-             if (uri) efreet_uri_free(uri);
+             efreet_uri_free(uri);
           }
         fclose(fp);
      }

diff --git a/src/modules/illume-keyboard/e_kbd_dict.c b/src/modules/illume-keyboard/e_kbd_dict.c
index 5a4218a59a6fb4f97761ede5269b1e609baa5ee5..eeb71a2957bc45b9f12d04f19e8308e091d339f8 100644 (file)
--- a/src/modules/illume-keyboard/e_kbd_dict.c
+++ b/src/modules/illume-keyboard/e_kbd_dict.c
@@ -153,7 +153,6 @@ _e_kbd_dict_writes_cb_sort(const void *d1, const void *d2)
    kw1 = d1;
    kw2 = d2;
    return _e_kbd_dict_normalized_strcmp(kw1->word, kw2->word);
-   return 0;
 }
 
 static const char *

diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c
index 6ceba125de732aa607690747cb5b4e067eef014b..3bac3cb2baf180cd52536c9c68b66a6b807306a9 100644 (file)
--- a/src/modules/xkbswitch/e_mod_main.c
+++ b/src/modules/xkbswitch/e_mod_main.c
@@ -496,7 +496,6 @@ _e_xkb_cb_lmenu_post(void *data, E_Menu *menu __UNUSED__)
 
    if (!inst) return;
    e_gadcon_locked_set(inst->gcc->gadcon, 0);
-   if (!(inst) || !inst->lmenu) return;
    inst->lmenu = NULL;
 }