fix all shadow warnings in msgbus module

ref cdb436ee8602728e18a63244988da22b25477819

diff --git a/src/modules/msgbus/msgbus_module.c b/src/modules/msgbus/msgbus_module.c
index 7a561966d6dff58e41aa79afb6328cc972e169da..f1823cced2d9d1830c365aeeb76fbd2c7fa9be2c 100644 (file)
--- a/src/modules/msgbus/msgbus_module.c
+++ b/src/modules/msgbus/msgbus_module.c
@@ -33,14 +33,14 @@ static Eldbus_Message *
 _e_msgbus_module_load_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                          const Eldbus_Message *msg)
 {
-   char *module;
+   char *mod;
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
 
-   if (!eldbus_message_arguments_get(msg, "s", &module)) return reply;
+   if (!eldbus_message_arguments_get(msg, "s", &mod)) return reply;
 
-   if (!e_module_find(module))
+   if (!e_module_find(mod))
      {
-        e_module_new(module);
+        e_module_new(mod);
         e_config_save_queue();
      }
 
@@ -51,13 +51,13 @@ static Eldbus_Message *
 _e_msgbus_module_unload_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                            const Eldbus_Message *msg)
 {
-   char *module;
+   char *mod;
    E_Module *m;
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
 
-   if (!eldbus_message_arguments_get(msg, "s", &module)) return reply;
+   if (!eldbus_message_arguments_get(msg, "s", &mod)) return reply;
 
-   if ((m = e_module_find(module)))
+   if ((m = e_module_find(mod)))
      {
         e_module_disable(m);
         e_object_del(E_OBJECT(m));
@@ -71,13 +71,13 @@ static Eldbus_Message *
 _e_msgbus_module_enable_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                            const Eldbus_Message *msg)
 {
-   char *module;
+   char *mod;
    E_Module *m;
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
 
-   if (!eldbus_message_arguments_get(msg, "s", &module)) return reply;
+   if (!eldbus_message_arguments_get(msg, "s", &mod)) return reply;
 
-   if ((m = e_module_find(module)))
+   if ((m = e_module_find(mod)))
      {
         e_module_enable(m);
         e_config_save_queue();
@@ -90,13 +90,13 @@ static Eldbus_Message *
 _e_msgbus_module_disable_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                             const Eldbus_Message *msg)
 {
-   char *module;
+   char *mod;
    E_Module *m;
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
 
-   if (!eldbus_message_arguments_get(msg, "s", &module)) return reply;
+   if (!eldbus_message_arguments_get(msg, "s", &mod)) return reply;
 
-   if ((m = e_module_find(module)))
+   if ((m = e_module_find(mod)))
      {
         e_module_disable(m);
         e_config_save_queue();

diff --git a/src/modules/msgbus/msgbus_profile.c b/src/modules/msgbus/msgbus_profile.c
index 24b29136d22ffa01a7220dfdf0041cc1a355da9b..84fd9109a747ac60843ad982339767949d72a373 100644 (file)
--- a/src/modules/msgbus/msgbus_profile.c
+++ b/src/modules/msgbus/msgbus_profile.c
@@ -34,14 +34,14 @@ static Eldbus_Message *
 _e_msgbus_profile_set_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                          const Eldbus_Message *msg)
 {
-   char *profile;
+   char *prof;
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
 
-   if (!eldbus_message_arguments_get(msg, "s", &profile))
+   if (!eldbus_message_arguments_get(msg, "s", &prof))
      return reply;
 
    e_config_save_flush();
-   e_config_profile_set(profile);
+   e_config_profile_set(prof);
    e_config_profile_save();
    e_config_save_block_set(1);
    e_sys_action_do(E_SYS_RESTART, NULL);
@@ -54,11 +54,11 @@ _e_msgbus_profile_get_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                          const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
-   const char *profile;
+   const char *prof;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(reply, NULL);
-   profile = e_config_profile_get();
-   eldbus_message_arguments_append(reply, "s", profile);
+   prof = e_config_profile_get();
+   eldbus_message_arguments_append(reply, "s", prof);
    return reply;
 }
 
@@ -95,12 +95,12 @@ static Eldbus_Message *
 _e_msgbus_profile_add_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                          const Eldbus_Message *msg)
 {
-   char *profile;
+   char *prof;
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
 
-   if (!eldbus_message_arguments_get(msg, "s", &profile))
+   if (!eldbus_message_arguments_get(msg, "s", &prof))
      return reply;
-   e_config_profile_add(profile);
+   e_config_profile_add(prof);
 
    return reply;
 }
@@ -109,15 +109,15 @@ static Eldbus_Message *
 _e_msgbus_profile_delete_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                             const Eldbus_Message *msg)
 {
-   char *profile;
+   char *prof;
 
-   if (!eldbus_message_arguments_get(msg, "s", &profile))
+   if (!eldbus_message_arguments_get(msg, "s", &prof))
      return eldbus_message_method_return_new(msg);
-   if (!strcmp(e_config_profile_get(), profile))
+   if (!strcmp(e_config_profile_get(), prof))
      return eldbus_message_error_new(msg,
                                     "org.enlightenment.DBus.InvalidArgument",
-                                    "Can't delete active profile");
-   e_config_profile_del(profile);
+                                    "Can't delete active prof");
+   e_config_profile_del(prof);
    return eldbus_message_method_return_new(msg);
 }