enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

fix all shadow warnings in msgbus module 

ref cdb436ee86
This commit is contained in:
Mike Blumenkrantz 2015-11-24 12:01:01 -05:00
parent 2c32787b87
commit 6addb294c8
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/msgbus/msgbus_module.c
View File

@ -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();

28
src/modules/msgbus/msgbus_profile.c
View File

@ -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);
}