Improve variable naming style

Change-Id: I9453e7a28fb47e08bc6795c4a99cc2adfc7fc5c0
Signed-off-by: taemin.yeom <taemin.yeom@samsung.com>

diff --git a/src/auto-test/battery.c b/src/auto-test/battery.c
index dca16ed..cf8c138 100644 (file)
--- a/src/auto-test/battery.c
+++ b/src/auto-test/battery.c
@@ -221,22 +221,22 @@ static struct power_supply_type {
 
 static bool get_battery_method(const char *method, int *value)
 {
-       GVariant *msg = NULL;
-       int val = 0, err;
+       GVariant *reply = NULL;
+       int reply_val = 0, ret_dbus;
        char* health = NULL;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
-                       method, NULL, &msg);
-       if (err < 0) {
+                       method, NULL, &reply);
+       if (ret_dbus < 0) {
                _E("Failed to call dbus method(%s): No reply.", method);
                return ret;
        }
 
        if (!strncmp(method, METHOD_BATTERY_HEALTH, strlen(METHOD_BATTERY_HEALTH))) {
-               if (!g_variant_get_safe(msg, "(s)", &health)) {
+               if (!g_variant_get_safe(reply, "(s)", &health)) {
                        _E("Failed to call dbus method(%s): No message.", METHOD_BATTERY_HEALTH);
                } else {
                        _I("Success. %s=%s", METHOD_BATTERY_HEALTH, health);
@@ -245,50 +245,50 @@ static bool get_battery_method(const char *method, int *value)
        }
        else
        {
-               if (!g_variant_get_safe(msg, "(i)", &val)) {
+               if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
                        _E("Failed to call dbus method(%s): No message.", method);
                } else {
-                       _I("Success. %s=%d", method, val);
+                       _I("Success. %s=%d", method, reply_val);
                        ret = TRUE;
                        if (NULL != value)
-                               *value = val;
+                               *value = reply_val;
                }
        }
 
        if (health)
                g_free(health);
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return ret;
 }
 
 static bool get_battery_method_vconf(const char *method)
 {
-       GVariant *msg = NULL;
-       int val, err;
+       GVariant *reply = NULL;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
-                       method, NULL, &msg);
-       if (err < 0) {
+                       method, NULL, &reply);
+       if (ret_dbus < 0) {
                _E("Failed to call dbus method(%s): No reply.", method);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("Failed to call dbus method(%s): No message.", method);
        else {
-               if (val == -EIO) {
+               if (reply_val == -EIO) {
                        _E("Failed to call dbus method(%s): Return fail.", method);
                } else {
-                       _I("Success. %s=%d", method, val);
+                       _I("Success. %s=%d", method, reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
@@ -309,29 +309,29 @@ static bool get_battery_low_level(int *value)
 
 static bool set_battery_low_level(int newlevel)
 {
-       GVariant *msg;
+       GVariant *reply;
        int getlevel = -1;
-       int val = -1;
-       int err;
+       int reply_val = -1;
+       int ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
                        METHOD_BATTERY_SETLOWBATLEVEL, g_variant_new("(i)", newlevel),
-                       &msg);
+                       &reply);
 
-       if (err < 0) {
+       if (ret_dbus < 0) {
                _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_SETLOWBATLEVEL);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
                _E("Failed to call dbus method(%s): No message", METHOD_BATTERY_SETLOWBATLEVEL);
                goto out;
        } else {
                if (newlevel <= DEFAULT_WARNING) {
-                       if (0 != val) {
+                       if (0 != reply_val) {
                                _I("Success. Can't set low level(%d) smaller than default(%d).", newlevel, DEFAULT_WARNING);
                                ret = TRUE;
                        } else {
@@ -339,7 +339,7 @@ static bool set_battery_low_level(int newlevel)
                        }
                        goto out;
                } else {
-                       if (0 != val) {
+                       if (0 != reply_val) {
                                _E("Failed to call dbus method(%s): Return fail.", METHOD_BATTERY_SETLOWBATLEVEL);
                                goto out;
                        }
@@ -357,7 +357,7 @@ static bool set_battery_low_level(int newlevel)
                }
        }
 out:
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
@@ -398,50 +398,50 @@ static bool get_battery_health()
 
 static bool get_battery_info()
 {
-       GVariant *msg;
-       int val[9];
-       int err;
+       GVariant *reply;
+       int reply_val[9];
+       int ret_dbus;
        bool ret = FALSE;
-       char *argv[3];
+       char *reply_argv[3];
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
-                       METHOD_BATTERY_GETINFO, NULL, &msg);
-       if (err < 0) {
+                       METHOD_BATTERY_GETINFO, NULL, &reply);
+       if (ret_dbus < 0) {
                _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_GETINFO);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(isssiiiiiiii)", &val[0],  //return value
-                                                       &argv[0],//status
-                                                       &argv[1],//health
-                                                       &argv[2],//power source
-                                                       &val[1],  //online
-                                                       &val[2],  //present
-                                                       &val[3],  //capacity
-                                                       &val[4],  //current_now
-                                                       &val[5], //current_average
-                                                       &val[6], //voltage_now
-                                                       &val[7], //voltage_average
-                                                       &val[8])) //temperature
+       if (!g_variant_get_safe(reply, "(isssiiiiiiii)", &reply_val[0],  //return value
+                                                       &reply_argv[0],//status
+                                                       &reply_argv[1],//health
+                                                       &reply_argv[2],//power source
+                                                       &reply_val[1],  //online
+                                                       &reply_val[2],  //present
+                                                       &reply_val[3],  //capacity
+                                                       &reply_val[4],  //current_now
+                                                       &reply_val[5], //current_average
+                                                       &reply_val[6], //voltage_now
+                                                       &reply_val[7], //voltage_average
+                                                       &reply_val[8])) //temperature
                _E("Failed to call dbus method(%s): No message", METHOD_BATTERY_GETINFO);
        else {
-               if (val[0] < 0) {
+               if (reply_val[0] < 0) {
                        _E("Failed to call dbus method(%s): Return fail", METHOD_BATTERY_GETINFO);
                } else {
                        _I("Success: %s %s %s %d %d %d %d %d %d %d %d",
-                                       argv[0], argv[1], argv[2], val[1], val[2],
-                                       val[3], val[4], val[5], val[6], val[7],
-                                       val[8]);
+                                       reply_argv[0], reply_argv[1], reply_argv[2], reply_val[1], reply_val[2],
+                                       reply_val[3], reply_val[4], reply_val[5], reply_val[6], reply_val[7],
+                                       reply_val[8]);
                        ret = TRUE;
                }
-               g_free(argv[0]);
-               g_free(argv[1]);
-               g_free(argv[2]);
+               g_free(reply_argv[0]);
+               g_free(reply_argv[1]);
+               g_free(reply_argv[2]);
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return ret;
 }
@@ -669,8 +669,8 @@ static bool compare_power_supply(struct power_supply_type list, int value[], con
 
 static bool set_battery_power_supply(int index)
 {
-       GVariant *msg, *var;
-       int val, err;
+       GVariant *reply, *var;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
        var = g_variant_new("(sisssssssssssss)", POWER_SUBSYSTEM,
@@ -703,74 +703,74 @@ static bool set_battery_power_supply(int index)
                                power_supply_types[index].current_avg,
                                power_supply_types[index].temperature);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_BATTERY,
                                                DEVICED_INTERFACE_BATTERY,
-                                               POWER_SUBSYSTEM, var, &msg);
-       if (err < 0) {
+                                               POWER_SUBSYSTEM, var, &reply);
+       if (ret_dbus < 0) {
                _E("Failed to call dbus method(%s): No reply", POWER_SUBSYSTEM);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
                _E("Failed to call dbus method(%s): No message", POWER_SUBSYSTEM);
-               val = -EBADMSG;
+               reply_val = -EBADMSG;
        } else {
-               if (val < 0) {
-                       _E("Failed to call dbus method(%s): Return fail(%d)", POWER_SUBSYSTEM, val);
+               if (reply_val < 0) {
+                       _E("Failed to call dbus method(%s): Return fail(%d)", POWER_SUBSYSTEM, reply_val);
                } else {
-                       _I("Success. val=%d", val);
+                       _I("Success. val=%d", reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        sleep(TEST_WAIT_TIME_INTERVAL);
 
        return ret;
 }
 
-static bool get_battery_power_supply(int rsp[], char **power_source)
+static bool get_battery_power_supply(int out_rsp[], char **out_power_source)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
-                       METHOD_BATTERY_GET_POWERSUPPLY, NULL, &msg);
-       if (err < 0) {
+                       METHOD_BATTERY_GET_POWERSUPPLY, NULL, &reply);
+       if (ret_dbus < 0) {
                _E("Failed to call dbus method(%s): No reply", METHOD_BATTERY_GET_POWERSUPPLY);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(iiiiiiiisiiiii)", &val,  //return value
-                                                       &rsp[0],        //capacity
-                                                       &rsp[1],        //charge_status
-                                                       &rsp[2],        //health
-                                                       &rsp[3],        //online
-                                                       &rsp[4],        //present
-                                                       &rsp[5],        //misc
-                                                       &rsp[6],        //freq_strength
-                                                       power_source,   //power_source
-                                                       &rsp[7],        //voltage_now
-                                                       &rsp[8],        //voltagge_avg
-                                                       &rsp[9],        //current_now
-                                                       &rsp[10],       //current_avg
-                                                       &rsp[11])) {    //temperature
+       if (!g_variant_get_safe(reply, "(iiiiiiiisiiiii)", &reply_val,  //return value
+                                                       &out_rsp[0],    //capacity
+                                                       &out_rsp[1],    //charge_status
+                                                       &out_rsp[2],    //health
+                                                       &out_rsp[3],    //online
+                                                       &out_rsp[4],    //present
+                                                       &out_rsp[5],    //misc
+                                                       &out_rsp[6],    //freq_strength
+                                                       out_power_source,       //power_source
+                                                       &out_rsp[7],    //voltage_now
+                                                       &out_rsp[8],    //voltagge_avg
+                                                       &out_rsp[9],    //current_now
+                                                       &out_rsp[10],   //current_avg
+                                                       &out_rsp[11])) {    //temperature
                _E("Failed to call dbus method(%s): No message", METHOD_BATTERY_GET_POWERSUPPLY);
        } else {
-               if (val < 0) {
-                       _E("Failed to call dbus method(%s): Return fail(%d)", METHOD_BATTERY_GET_POWERSUPPLY, val);
+               if (reply_val < 0) {
+                       _E("Failed to call dbus method(%s): Return fail(%d)", METHOD_BATTERY_GET_POWERSUPPLY, reply_val);
                } else {
                        _I("Success : C(%d) S(%d) H(%d) O(%d) P(%d) M(%d) F(%d) SRC(%s) Vol(%d %d) Cur(%d %d) Temp(%d)",
-                               rsp[0], rsp[1], rsp[2], rsp[3], rsp[4], rsp[5], rsp[6], *power_source, rsp[7], rsp[8], rsp[9], rsp[10], rsp[11]);
+                               out_rsp[0], out_rsp[1], out_rsp[2], out_rsp[3], out_rsp[4], out_rsp[5], out_rsp[6], *out_power_source, out_rsp[7], out_rsp[8], out_rsp[9], out_rsp[10], out_rsp[11]);
                        ret = true;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return ret;
 }

diff --git a/src/auto-test/brightness.c b/src/auto-test/brightness.c
index 5ed65a1..28e559d 100644 (file)
--- a/src/auto-test/brightness.c
+++ b/src/auto-test/brightness.c
@@ -44,12 +44,12 @@ static void stop_udev(void)
 
 static int call_display_method_sync(const char *method, GVariant *param)
 {
-       int err;
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       int ret_dbus;
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        method, param, NULL);
-       if (err < 0) {
+       if (ret_dbus < 0) {
                _E("Failed to %s.", method);
                return -1;
        }
@@ -59,33 +59,33 @@ static int call_display_method_sync(const char *method, GVariant *param)
 
 static void check_result(int expect_default, int expect_current)
 {
-       int err;
-       int result_default;
-       int result_current;
+       int ret_dbus;
+       int reply_default;
+       int reply_current;
        bool match_default;
        bool match_current;
-       GVariant *msg;
+       GVariant *reply;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
-                       "GetBrightnessInfo", NULL, &msg);
-       if (err < 0) {
+                       "GetBrightnessInfo", NULL, &reply);
+       if (ret_dbus < 0) {
                _E("Failed to GetBrightnessInfo.");
                return;
        }
 
-       if (!g_variant_get_safe(msg, "(ii)", &result_default, &result_current)) {
+       if (!g_variant_get_safe(reply, "(ii)", &reply_default, &reply_current)) {
                _D("Return type mismatching from GetBrightnessInfo.");
                return;
        }
 
-       match_default = expect_default == result_default;
-       match_current = expect_current == result_current;
+       match_default = expect_default == reply_default;
+       match_current = expect_current == reply_current;
 
        printf("%6d %6d %c | %6d %6d %c\n",
-               expect_default, result_default, match_default ? ' ' : 'X',
-               expect_current, result_current, match_current ? ' ' : 'X');
+               expect_default, reply_default, match_default ? ' ' : 'X',
+               expect_current, reply_current, match_current ? ' ' : 'X');
 
        tc_success &= (match_default && match_current);
 }
@@ -316,10 +316,10 @@ static void do_test(const char *tcname)
 {
        int i;
        int timeout;
-       int ret = -1;
+       int ret_val = -1;
 
-       ret = vconf_get_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, &timeout);
-       if (ret == 0) {
+       ret_val = vconf_get_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, &timeout);
+       if (ret_val == 0) {
                if (vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 300) < 0)
                        printf("Failed to set LCDNORMAL timeout, %d.\n", vconf_get_ext_errno());
        }
@@ -350,7 +350,7 @@ static void do_test(const char *tcname)
        printf("Success: %d, Fail: %d\n", success, fail);
 
        start_udev();
-       if (ret == 0) {
+       if (ret_val == 0) {
                if (vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, timeout) < 0)
                        printf("Failed to restore LCDNORMAL timeout, %d.\n", vconf_get_ext_errno());
        }

diff --git a/src/auto-test/display.c b/src/auto-test/display.c
index 2995ce9..9a9c5d4 100644 (file)
--- a/src/auto-test/display.c
+++ b/src/auto-test/display.c
@@ -54,81 +54,81 @@
 #define PM_STATE_LOG_FILE                      "/var/log/pm_state.log"
 #define PALM_STR                               "palm"
 
-static bool get_display_method(const char *method, GVariant *param, int *value)
+static bool get_display_method(const char *method, GVariant *param, int *out_value)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
-                       method, param, &msg);
-       if (err < 0) {
+                       method, param, &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail (%s): no message", method);
        else {
-               _I("success (%s): %d", method, val);
+               _I("success (%s): %d", method, reply_val);
                ret = TRUE;
-               if (NULL != value)
-                       *value = val;
+               if (NULL != out_value)
+                       *out_value = reply_val;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
 static bool set_display_method(const char *method, GVariant *param)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
-                       method, param, &msg);
-       if (err < 0) {
+                       method, param, &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail (%s): no message", method);
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! (%s): %d", method, val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! (%s): %d", method, reply_val);
                        ret = TRUE;
-               } else if (val < 0) {
-                       _E("fail (%s): returned fail (%d)", method, val);
+               } else if (reply_val < 0) {
+                       _E("fail (%s): returned fail (%d)", method, reply_val);
                } else {
-                       _I("success (%s): %d", method, val);
+                       _I("success (%s): %d", method, reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
 static bool set_display_method_noreply(const char *method, GVariant *var)
 {
-       GVariant *msg;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
-                       method, var, &msg);
-       if (err < 0) {
+                       method, var, &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return FALSE;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return TRUE;
 }
 
@@ -154,41 +154,41 @@ static bool get_display_custombrightness()
 
 static bool set_display_autobrightness_min(int min)
 {
-       GVariant *msg;
-       int val = 0, err;
+       GVariant *reply;
+       int reply_val = 0, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                METHOD_DISPLAY_SETAUTOBRIGHTNESSMIN,
                                                g_variant_new("(i)", min),
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                _E("fail : no reply");
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
                _E("fail : no message");
        } else {
                if ((min < 1) || (min > 100)) {
-                       if (val < 0) {
+                       if (reply_val < 0) {
                                _I("success : autobrightness min value should be 1~100. can't set (%d).", min);
                                ret = TRUE;
                        } else {
                                _I("fail : can't set (%d). but returned success", min);
                        }
                } else {
-                       if (val < 0) {
-                               _E("fail : return fail (%d)", val);
+                       if (reply_val < 0) {
+                               _E("fail : return fail (%d)", reply_val);
                        } else {
-                               _I("success : %d", val);
+                               _I("success : %d", reply_val);
                                ret = TRUE;
                        }
                }
        }
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
@@ -305,16 +305,16 @@ static bool set_display_powerkey_lcdoff()
 static bool set_display_locktimeout_expired(char *req_id)
 {
        DBusMessage *msg;
-       int val, err;
+       int val, ret_dbus;
        char *ret_req_id;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        METHOD_DISPLAY_LOCKTIMEOUT_EXPIRED, g_variant_new("(s)", req_id),
                        &msg);
-       if (err < 0) {
+       if (ret_dbus < 0) {
                _E("fail: no reply");
                return ret;
        }

diff --git a/src/auto-test/extcon.c b/src/auto-test/extcon.c
index f4b2f0f..bf8efa9 100644 (file)
--- a/src/auto-test/extcon.c
+++ b/src/auto-test/extcon.c
@@ -26,104 +26,104 @@
 
 static bool request_extcon_method(const char *method, GVariant *param)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_EXTCON,
                                                DEVICED_INTERFACE_EXTCON,
                                                method,
                                                param,
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail (%s): no message", method);
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! (%s): %d", method, val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! (%s): %d", method, reply_val);
                        ret = TRUE;
-               } else if (val < 0) {
-                       _E("fail (%s): returned fail (%d)", method, val);
+               } else if (reply_val < 0) {
+                       _E("fail (%s): returned fail (%d)", method, reply_val);
                } else {
-                       _I("success (%s): %d", method, val);
+                       _I("success (%s): %d", method, reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
 static bool get_sysnoti_method(const char *method)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_SYSNOTI,
                                        DEVICED_INTERFACE_SYSNOTI,
-                                       method, NULL, &msg);
-       if (err < 0) {
+                                       method, NULL, &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail (%s): no message", method);
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! (%s): %d", method, val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! (%s): %d", method, reply_val);
                        ret = TRUE;
-               } else if ((val == -EINVAL) || (val == -ENOENT)) {
-                       _E("fail : returned fail (%d)", val);
+               } else if ((reply_val == -EINVAL) || (reply_val == -ENOENT)) {
+                       _E("fail : returned fail (%d)", reply_val);
                } else {
-                       _I("success (%s): %d", method, val);
+                       _I("success (%s): %d", method, reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
 static bool get_extcon_status(char *device_name)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_EXTCON,
                                                DEVICED_INTERFACE_EXTCON,
                                                METHOD_EXTCON_GETSTATUS,
                                                g_variant_new("(s)", device_name),
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                _E("fail : no reply");
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail : no message");
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! : %d", val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! : %d", reply_val);
                        ret = TRUE;
-               } else if ((val == -EINVAL) || (val == -ENOENT)) {
-                       _E("fail : returned fail (%d)", val);
+               } else if ((reply_val == -EINVAL) || (reply_val == -ENOENT)) {
+                       _E("fail : returned fail (%d)", reply_val);
                } else {
-                       _I("success : %d", val);
+                       _I("success : %d", reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 

diff --git a/src/auto-test/ir.c b/src/auto-test/ir.c
index 06565f6..87d11e0 100644 (file)
--- a/src/auto-test/ir.c
+++ b/src/auto-test/ir.c
@@ -28,8 +28,8 @@ struct dbus_int {
 
 static bool request_ir_method(const char *method, const char *sig, int *param)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
        GVariant *var = NULL;
 
@@ -42,34 +42,34 @@ static bool request_ir_method(const char *method, const char *sig, int *param)
                return FALSE;
        }
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_IR,
                                                DEVICED_INTERFACE_IR,
                                                method,
                                                var,
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail (%s): no message", method);
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! (%s): %d", method, val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! (%s): %d", method, reply_val);
                        ret = TRUE;
-               } else if (val == -ENODEV) {
-                       _E("fail (%s): device open fail (%d)", method, val);
-               } else if (val < 0) {
-                       _E("fail (%s): returned fail (%d)", method, val);
+               } else if (reply_val == -ENODEV) {
+                       _E("fail (%s): device open fail (%d)", method, reply_val);
+               } else if (reply_val < 0) {
+                       _E("fail (%s): returned fail (%d)", method, reply_val);
                } else {
-                       _I("success (%s): %d", method, val);
+                       _I("success (%s): %d", method, reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 
@@ -93,36 +93,36 @@ static bool set_ir_transmit(int carrier_frequency, int *pattern, int size)
 /*legacy command*/
 static bool set_ir_command(char *command)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_LED,
                                                DEVICED_INTERFACE_LED,
                                                METHOD_IR_SETIRCOMMAND,
                                                g_variant_new("(s)", command),
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                _E("fail : no reply");
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail : no message");
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! : %d", val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! : %d", reply_val);
                        ret = TRUE;
-               } else if (val < 0) {
-                       _E("fail : returned fail (%d)", val);
+               } else if (reply_val < 0) {
+                       _E("fail : returned fail (%d)", reply_val);
                } else {
-                       _I("success : %d", val);
+                       _I("success : %d", reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 

diff --git a/src/auto-test/led.c b/src/auto-test/led.c
index 807364a..8a4deae 100755 (executable)
--- a/src/auto-test/led.c
+++ b/src/auto-test/led.c
@@ -40,14 +40,14 @@ static unsigned int color[] = {BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE,BLUE
 static bool get_led_method(const char *method)
 {
        GVariant *msg;
-       int val, err;
+       int val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_LED,
                                        DEVICED_INTERFACE_LED,
                                        method, NULL, &msg);
-       if (err < 0) {
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
@@ -66,14 +66,14 @@ static bool get_led_method(const char *method)
 static bool set_led_method(const char *method, GVariant *param)
 {
        GVariant *msg;
-       int val, err;
+       int val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_LED,
                                                DEVICED_INTERFACE_LED,
                                                method, param, &msg);
-       if (err < 0) {
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }

diff --git a/src/auto-test/power.c b/src/auto-test/power.c
index 49ebc75..ae4d96a 100644 (file)
--- a/src/auto-test/power.c
+++ b/src/auto-test/power.c
@@ -22,36 +22,36 @@
 
 static bool set_reboot_method(const char *method, GVariant *param)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_POWEROFF,
                                                DEVICED_INTERFACE_POWEROFF,
                                                method,
                                                param,
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail (%s): no message", method);
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! (%s): %d", method, val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! (%s): %d", method, reply_val);
                        ret = TRUE;
-               } else if (val < 0) {
-                       _E("fail (%s): returned fail (%d)", method, val);
+               } else if (reply_val < 0) {
+                       _E("fail (%s): returned fail (%d)", method, reply_val);
                } else {
-                       _I("success (%s): %d", method, val);
+                       _I("success (%s): %d", method, reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 

diff --git a/src/auto-test/proc.c b/src/auto-test/proc.c
index 28dfa4c..39dad46 100644 (file)
--- a/src/auto-test/proc.c
+++ b/src/auto-test/proc.c
@@ -22,34 +22,34 @@
 
 static bool get_sysnoti_revision()
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_SYSNOTI,
                                        DEVICED_INTERFACE_SYSNOTI,
-                                       METHOD_SYSNOTI_GETREVISION, NULL, &msg);
-       if (err < 0) {
+                                       METHOD_SYSNOTI_GETREVISION, NULL, &reply);
+       if (ret_dbus < 0) {
                _E("fail : no reply");
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail : no message");
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! : %d", val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! : %d", reply_val);
                        ret = TRUE;
-               } else if (val < 0) {
-                       _E("fail : returned fail (%d)", val);
+               } else if (reply_val < 0) {
+                       _E("fail : returned fail (%d)", reply_val);
                } else {
-                       _I("success : %d", val);
+                       _I("success : %d", reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 

diff --git a/src/auto-test/test_dbus_interface.c b/src/auto-test/test_dbus_interface.c
index 62b158f..ffa4e34 100644 (file)
--- a/src/auto-test/test_dbus_interface.c
+++ b/src/auto-test/test_dbus_interface.c
@@ -37,22 +37,22 @@
 gint test_deviced_Tzip_IsMounted(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "IsMounted",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed IsMounted");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -62,22 +62,22 @@ gint test_deviced_Tzip_IsMounted(const gchar *param1)
 gint test_deviced_Tzip_UnmountSync(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "UnmountSync",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed UnmountSync");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -87,22 +87,22 @@ gint test_deviced_Tzip_UnmountSync(const gchar *param1)
 gint test_deviced_Tzip_MountSync(const gchar *param1, const gchar *param2, const gchar *param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "MountSync",
                        g_variant_new("(sss)", param1, param2, param3),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed MountSync");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -112,22 +112,22 @@ gint test_deviced_Tzip_MountSync(const gchar *param1, const gchar *param2, const
 gint test_deviced_Tzip_Unmount(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "Unmount",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed Unmount");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -137,22 +137,22 @@ gint test_deviced_Tzip_Unmount(const gchar *param1)
 gint test_deviced_Tzip_Mount(const gchar *param1, const gchar *param2, const gchar *param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "Mount",
                        g_variant_new("(sss)", param1, param2, param3),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed Mount");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -165,22 +165,22 @@ gint test_deviced_Tzip_Mount(const gchar *param1, const gchar *param2, const gch
 gint test_deviced_ExtCon_disable(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/ExtCon",
                        "org.tizen.system.deviced.ExtCon",
                        "disable",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed disable");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -190,22 +190,22 @@ gint test_deviced_ExtCon_disable(const gchar *param1)
 gint test_deviced_ExtCon_enable(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/ExtCon",
                        "org.tizen.system.deviced.ExtCon",
                        "enable",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed enable");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -215,22 +215,22 @@ gint test_deviced_ExtCon_enable(const gchar *param1)
 gint test_deviced_ExtCon_GetStatus(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/ExtCon",
                        "org.tizen.system.deviced.ExtCon",
                        "GetStatus",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetStatus");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -242,18 +242,18 @@ gint test_deviced_ExtCon_GetStatus(const gchar *param1)
 
 void test_deviced_UsbHostTest_stop(void)
 {
-       int err;
-       GVariant *ret;
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       int ret_dbus;
+       GVariant *reply;
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/UsbHostTest",
                        "org.tizen.system.deviced.UsbHostTest",
                        "stop",
                        NULL,
-                       &ret);;
-       if (err < 0)
+                       &reply);;
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 
 }
 
@@ -261,18 +261,18 @@ void test_deviced_UsbHostTest_stop(void)
 
 void test_deviced_UsbHostTest_start(void)
 {
-       int err;
-       GVariant *ret;
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       int ret_dbus;
+       GVariant *reply;
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/UsbHostTest",
                        "org.tizen.system.deviced.UsbHostTest",
                        "start",
                        NULL,
-                       &ret);;
-       if (err < 0)
+                       &reply);;
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 
 }
 
@@ -284,22 +284,22 @@ void test_deviced_UsbHostTest_start(void)
 gint test_deviced_lowpower_GetState(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/LowPower",
                        "org.tizen.system.deviced.lowpower",
                        "GetState",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetState");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -309,22 +309,22 @@ gint test_deviced_lowpower_GetState(void)
 gint test_deviced_lowpower_Stop(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/LowPower",
                        "org.tizen.system.deviced.lowpower",
                        "Stop",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed Stop");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -334,22 +334,22 @@ gint test_deviced_lowpower_Stop(void)
 gint test_deviced_lowpower_Start(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/LowPower",
                        "org.tizen.system.deviced.lowpower",
                        "Start",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed Start");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -362,22 +362,22 @@ gint test_deviced_lowpower_Start(void)
 gint test_deviced_ir_TransmitIR(gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Ir",
                        "org.tizen.system.deviced.ir",
                        "TransmitIR",
                        g_variant_new("(ai)", param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed TransmitIR");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -387,22 +387,22 @@ gint test_deviced_ir_TransmitIR(gint param2)
 gint test_deviced_ir_IRIsAvailable(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Ir",
                        "org.tizen.system.deviced.ir",
                        "IRIsAvailable",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed IRIsAvailable");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -415,22 +415,22 @@ gint test_deviced_ir_IRIsAvailable(void)
 gint test_deviced_PowerOff_RemovePowerOffWait(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "RemovePowerOffWait",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed RemovePowerOffWait");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -440,22 +440,22 @@ gint test_deviced_PowerOff_RemovePowerOffWait(void)
 gint test_deviced_PowerOff_AddPowerOffWait(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "AddPowerOffWait",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed AddPowerOffWait");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -465,22 +465,22 @@ gint test_deviced_PowerOff_AddPowerOffWait(void)
 gint test_deviced_PowerOff_PowerOffWithOption(const gchar *param1, const gchar *param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "PowerOffWithOption",
                        g_variant_new("(ss)", param1, param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed PowerOffWithOption");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -490,22 +490,22 @@ gint test_deviced_PowerOff_PowerOffWithOption(const gchar *param1, const gchar *
 gint test_deviced_PowerOff_PowerOff(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "PowerOff",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed PowerOff");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -518,22 +518,22 @@ gint test_deviced_PowerOff_PowerOff(const gchar *param1)
 gint test_deviced_Battery_MiscEvent(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "MiscEvent",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed MiscEvent");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -542,16 +542,16 @@ gint test_deviced_Battery_MiscEvent(void)
 
 GVariant * test_deviced_Battery_BatteryProperties(void)
 {
-       GVariant *ret;
-       int err;
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       GVariant *reply;
+       int ret_dbus;
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "BatteryProperties",
-                       NULL, &ret);
-       if (err < 0)
+                       NULL, &reply);
+       if (ret_dbus < 0)
                return NULL;
-       return ret;
+       return reply;
 }
 
 // ChargerCharging : in i, out i
@@ -559,22 +559,22 @@ GVariant * test_deviced_Battery_BatteryProperties(void)
 gint test_deviced_Battery_ChargerCharging(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargerCharging",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ChargerCharging");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -584,22 +584,22 @@ gint test_deviced_Battery_ChargerCharging(gint param1)
 gint test_deviced_Battery_ChargerType(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargerType",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ChargerType");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -608,18 +608,18 @@ gint test_deviced_Battery_ChargerType(void)
 
 GVariant * test_deviced_Battery_GetBatteryInfo(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetBatteryInfo",
                        NULL,
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return NULL;
-       return ret;
+       return reply;
 }
 
 // power_supply : in sissssss, out i
@@ -627,22 +627,22 @@ GVariant * test_deviced_Battery_GetBatteryInfo(void)
 gint test_deviced_Battery_power_supply(const gchar *param1, gint param2, const gchar *param3, const gchar *param4, const gchar *param5, const gchar *param6, const gchar *param7, const gchar *param8)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "power_supply",
                        g_variant_new("(sissssss)", param1, param2, param3, param4, param5, param6, param7, param8),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed power_supply");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -652,22 +652,22 @@ gint test_deviced_Battery_power_supply(const gchar *param1, gint param2, const g
 gchar * test_deviced_Battery_GetHealth(void)
 {
        gchar *val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetHealth",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetHealth");
                return 0;
        }
 
-       g_variant_get(ret, "(s)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(s)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -677,22 +677,22 @@ gchar * test_deviced_Battery_GetHealth(void)
 gint test_deviced_Battery_IsFull(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "IsFull",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed IsFull");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -702,22 +702,22 @@ gint test_deviced_Battery_IsFull(void)
 gint test_deviced_Battery_GetPercentRaw(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetPercentRaw",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetPercentRaw");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -727,22 +727,22 @@ gint test_deviced_Battery_GetPercentRaw(void)
 gint test_deviced_Battery_GetPercent(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetPercent",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetPercent");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -752,22 +752,22 @@ gint test_deviced_Battery_GetPercent(void)
 gint test_deviced_Battery_BatteryStatusLow(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "BatteryStatusLow",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed BatteryStatusLow");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -777,22 +777,22 @@ gint test_deviced_Battery_BatteryStatusLow(void)
 gint test_deviced_Battery_ChargeNow(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargeNow",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ChargeNow");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -802,22 +802,22 @@ gint test_deviced_Battery_ChargeNow(void)
 gint test_deviced_Battery_ChargerStatus(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargerStatus",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ChargerStatus");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -827,22 +827,22 @@ gint test_deviced_Battery_ChargerStatus(void)
 gint test_deviced_Battery_GetLowbatLevel(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetLowbatLevel",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetLowbatLevel");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -852,22 +852,22 @@ gint test_deviced_Battery_GetLowbatLevel(void)
 gint test_deviced_Battery_SetLowbatLevel(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "SetLowbatLevel",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed SetLowbatLevel");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -877,22 +877,22 @@ gint test_deviced_Battery_SetLowbatLevel(gint param1)
 gint test_deviced_Battery_TimeToEmpty(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "TimeToEmpty",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed TimeToEmpty");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -902,22 +902,22 @@ gint test_deviced_Battery_TimeToEmpty(void)
 gint test_deviced_Battery_TimeToFull(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "TimeToFull",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed TimeToFull");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -930,22 +930,22 @@ gint test_deviced_Battery_TimeToFull(void)
 gint test_deviced_temperature_GetTemperature(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Temperature",
                        "org.tizen.system.deviced.temperature",
                        "GetTemperature",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetTemperature");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -957,18 +957,18 @@ gint test_deviced_temperature_GetTemperature(gint param1)
 
 GVariant * test_deviced_BatteryMonitor_GetBMData(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/BatteryMonitor",
                        "org.tizen.system.deviced.BatteryMonitor",
                        "GetBMData",
                        NULL,
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return NULL;
-       return ret;
+       return reply;
 }
 
 // /Org/Tizen/System/DeviceD/Core
@@ -978,19 +978,19 @@ GVariant * test_deviced_BatteryMonitor_GetBMData(void)
 
 void test_deviced_core_DeviceList(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Core",
                        "org.tizen.system.deviced.core",
                        "DeviceList",
                        NULL,
-                       &ret);;
-       if (err < 0)
+                       &reply);;
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 }
 
 // /Org/Tizen/System/DeviceD/Usbhost
@@ -1000,18 +1000,18 @@ void test_deviced_core_DeviceList(void)
 
 GVariant * test_deviced_Usbhost_OpenDevice(const gchar *param1)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "OpenDevice",
                        g_variant_new("(s)", param1),
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return NULL;
-       return ret;
+       return reply;
 }
 
 // GetDeviceListCount : in i, out i
@@ -1019,22 +1019,22 @@ GVariant * test_deviced_Usbhost_OpenDevice(const gchar *param1)
 gint test_deviced_Usbhost_GetDeviceListCount(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "GetDeviceListCount",
                        g_variant_new("(i)", param1),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetDeviceListCount");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1043,37 +1043,37 @@ gint test_deviced_Usbhost_GetDeviceListCount(gint param1)
 
 GVariant * test_deviced_Usbhost_GetDeviceList(gint param1)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "GetDeviceList",
                        g_variant_new("(i)", param1),
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return NULL;
-       return ret;
+       return reply;
 }
 
 // PrintPolicy : in , out
 
 void test_deviced_Usbhost_PrintPolicy(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "PrintPolicy",
                        NULL,
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 
 }
 
@@ -1081,19 +1081,19 @@ void test_deviced_Usbhost_PrintPolicy(void)
 
 void test_deviced_Usbhost_PrintDeviceList(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "PrintDeviceList",
                        NULL,
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 
 }
 
@@ -1105,22 +1105,22 @@ void test_deviced_Usbhost_PrintDeviceList(void)
 guint test_deviced_Usb_GetMode(void)
 {
        guint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usb",
                        "org.tizen.system.deviced.Usb",
                        "GetMode",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetMode");
                return 0;
        }
 
-       g_variant_get(ret, "(u)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(u)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1130,22 +1130,22 @@ guint test_deviced_Usb_GetMode(void)
 guint test_deviced_Usb_GetState(void)
 {
        guint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usb",
                        "org.tizen.system.deviced.Usb",
                        "GetState",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetState");
                return 0;
        }
 
-       g_variant_get(ret, "(u)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(u)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1158,22 +1158,22 @@ guint test_deviced_Usb_GetState(void)
 gint test_deviced_SysNoti_GetHDMI(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "GetHDMI",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetHDMI");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1183,22 +1183,22 @@ gint test_deviced_SysNoti_GetHDMI(void)
 gint test_deviced_SysNoti_GetCradle(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "GetCradle",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetCradle");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1208,22 +1208,22 @@ gint test_deviced_SysNoti_GetCradle(void)
 gint test_deviced_SysNoti_set_timezone(const gchar *param1, gint param2, const gchar *param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "set_timezone",
                        g_variant_new("(sis)", param1, param2, param3),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed set_timezone");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1233,22 +1233,22 @@ gint test_deviced_SysNoti_set_timezone(const gchar *param1, gint param2, const g
 gint test_deviced_SysNoti_set_datetime(const gchar *param1, gint param2, const gchar *param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "set_datetime",
                        g_variant_new("(sis)", param1, param2, param3),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed set_datetime");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1258,22 +1258,22 @@ gint test_deviced_SysNoti_set_datetime(const gchar *param1, gint param2, const g
 gint test_deviced_SysNoti_GetRevision(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "GetRevision",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetRevision");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1283,22 +1283,22 @@ gint test_deviced_SysNoti_GetRevision(void)
 gint test_deviced_SysNoti_udev(const gchar *param1, gint param2, const gchar *param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "udev",
                        g_variant_new("(sis)", param1, param2, param3),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed udev");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1308,22 +1308,22 @@ gint test_deviced_SysNoti_udev(const gchar *param1, gint param2, const gchar *pa
 gint test_deviced_SysNoti_EventStop(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "EventStop",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed EventStop");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1333,22 +1333,22 @@ gint test_deviced_SysNoti_EventStop(void)
 gint test_deviced_SysNoti_EventStart(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "EventStart",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed EventStart");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1358,22 +1358,22 @@ gint test_deviced_SysNoti_EventStart(void)
 gint test_deviced_SysNoti_getcontrol(const gchar *param1, gint param2, const gchar *param3, const gchar *param4)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "getcontrol",
                        g_variant_new("(siss)", param1, param2, param3, param4),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed getcontrol");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1383,22 +1383,22 @@ gint test_deviced_SysNoti_getcontrol(const gchar *param1, gint param2, const gch
 gint test_deviced_SysNoti_control(const gchar *param1, gint param2, const gchar *param3, const gchar *param4, const gchar *param5)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "control",
                        g_variant_new("(sisss)", param1, param2, param3, param4, param5),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed control");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1411,22 +1411,22 @@ gint test_deviced_SysNoti_control(const gchar *param1, gint param2, const gchar
 gint test_deviced_Led_SetIrCommand(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "SetIrCommand",
                        g_variant_new("(s)", param1),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed SetIrCommand");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1436,22 +1436,22 @@ gint test_deviced_Led_SetIrCommand(const gchar *param1)
 gint test_deviced_Led_SetBrightness(gint param1, gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "SetBrightness",
                        g_variant_new("(ii)", param1, param2),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed SetBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1461,22 +1461,22 @@ gint test_deviced_Led_SetBrightness(gint param1, gint param2)
 gint test_deviced_Led_GetMaxBrightness(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "GetMaxBrightness",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetMaxBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1486,22 +1486,22 @@ gint test_deviced_Led_GetMaxBrightness(void)
 gint test_deviced_Led_GetBrightness(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "GetBrightness",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1511,22 +1511,22 @@ gint test_deviced_Led_GetBrightness(void)
 gint test_deviced_Led_GetBrightnessForCamera(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "GetBrightnessForCamera",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed GetBrightnessForCamera");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1539,22 +1539,22 @@ gint test_deviced_Led_GetBrightnessForCamera(void)
 gint test_deviced_display_LockTimeoutInput(const gchar *param1, gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LockTimeoutInput",
                        g_variant_new("(si)", param1, param2),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed LockTimeoutInput");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1564,22 +1564,22 @@ gint test_deviced_display_LockTimeoutInput(const gchar *param1, gint param2)
 gint test_deviced_display_LockTimeoutExpired(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LockTimeoutExpired",
                        g_variant_new("(s)", param1),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed LockTimeoutExpired");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1589,22 +1589,22 @@ gint test_deviced_display_LockTimeoutExpired(const gchar *param1)
 gint test_deviced_display_CurrentBrightness(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CurrentBrightness",
                        g_variant_new("(i)", param1),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed CurrentBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1614,22 +1614,22 @@ gint test_deviced_display_CurrentBrightness(gint param1)
 gint test_deviced_display_CustomBrightness(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CustomBrightness",
                        NULL,
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed CustomBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1639,22 +1639,22 @@ gint test_deviced_display_CustomBrightness(void)
 gint test_deviced_display_ActorControl(const gchar *param1, gint param2, gint param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "ActorControl",
                        g_variant_new("(sii)", param1, param2, param3),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed ActorControl");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1664,22 +1664,22 @@ gint test_deviced_display_ActorControl(const gchar *param1, gint param2, gint pa
 gint test_deviced_display_LCDPanelOffMode(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LCDPanelOffMode",
                        g_variant_new("(i)", param1),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed LCDPanelOffMode");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1689,22 +1689,22 @@ gint test_deviced_display_LCDPanelOffMode(gint param1)
 gint test_deviced_display_StayTouchScreenOff(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "StayTouchScreenOff",
                        g_variant_new("(i)", param1),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed StayTouchScreenOff");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1714,22 +1714,22 @@ gint test_deviced_display_StayTouchScreenOff(gint param1)
 gint test_deviced_display_PlatformLCDControl(gint param1, const gchar *param2, gint param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "PlatformLCDControl",
                        g_variant_new("(isi)", param1, param2, param3),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed PlatformLCDControl");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1739,22 +1739,22 @@ gint test_deviced_display_PlatformLCDControl(gint param1, const gchar *param2, g
 gint test_deviced_display_CustomLCDOff(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CustomLCDOff",
                        g_variant_new("(s)", param1),
-                       &ret);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("failed CustomLCDOff");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1764,22 +1764,22 @@ gint test_deviced_display_CustomLCDOff(const gchar *param1)
 gint test_deviced_display_CustomLCDOn(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CustomLCDOn",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CustomLCDOn");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1789,22 +1789,22 @@ gint test_deviced_display_CustomLCDOn(gint param1)
 gint test_deviced_display_PowerKeyLCDOff(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "PowerKeyLCDOff",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed PowerKeyLCDOff");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1814,22 +1814,22 @@ gint test_deviced_display_PowerKeyLCDOff(void)
 gint test_deviced_display_PowerKeyIgnore(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "PowerKeyIgnore",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed PowerKeyIgnore");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1838,19 +1838,19 @@ gint test_deviced_display_PowerKeyIgnore(gint param1)
 
 void test_deviced_display_SaveLog(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SaveLog",
                        NULL,
-                       &ret);;
-       if (err < 0)
+                       &reply);;
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 
 }
 
@@ -1859,22 +1859,22 @@ void test_deviced_display_SaveLog(void)
 gint test_deviced_display_Dumpmode(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "Dumpmode",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed Dumpmode");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1884,22 +1884,22 @@ gint test_deviced_display_Dumpmode(const gchar *param1)
 gint test_deviced_display_SetRefreshRate(gint param1, gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SetRefreshRate",
                        g_variant_new("(ii)", param1, param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed SetRefreshRate");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1909,22 +1909,22 @@ gint test_deviced_display_SetRefreshRate(gint param1, gint param2)
 gint test_deviced_display_ReleaseBrightness(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "ReleaseBrightness",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ReleaseBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1934,22 +1934,22 @@ gint test_deviced_display_ReleaseBrightness(void)
 gint test_deviced_display_HoldBrightness(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "HoldBrightness",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed HoldBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1959,22 +1959,22 @@ gint test_deviced_display_HoldBrightness(gint param1)
 gint test_deviced_display_SetBrightness(gint param1, gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SetBrightness",
                        g_variant_new("(ii)", param1, param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed SetBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -1984,22 +1984,22 @@ gint test_deviced_display_SetBrightness(gint param1, gint param2)
 gint test_deviced_display_GetBrightness(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "GetBrightness",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2009,22 +2009,22 @@ gint test_deviced_display_GetBrightness(gint param1)
 gint test_deviced_display_SetMaxBrightness(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SetMaxBrightness",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed SetMaxBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2034,22 +2034,22 @@ gint test_deviced_display_SetMaxBrightness(gint param1)
 gint test_deviced_display_GetMaxBrightness(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "GetMaxBrightness",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetMaxBrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2059,22 +2059,22 @@ gint test_deviced_display_GetMaxBrightness(gint param1)
 gint test_deviced_display_GetDisplayCount(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "GetDisplayCount",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetDisplayCount");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2084,22 +2084,22 @@ gint test_deviced_display_GetDisplayCount(void)
 gint test_deviced_display_LockScreenBgOn(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LockScreenBgOn",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed LockScreenBgOn");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2109,22 +2109,22 @@ gint test_deviced_display_LockScreenBgOn(const gchar *param1)
 gint test_deviced_display_setlcdtimeout(gint param1, gint param2, gint param3)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setlcdtimeout",
                        g_variant_new("(iii)", param1, param2, param3),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed setlcdtimeout");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2134,22 +2134,22 @@ gint test_deviced_display_setlcdtimeout(gint param1, gint param2, gint param3)
 gint test_deviced_display_setautobrightnessmin(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setautobrightnessmin",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed setautobrightnessmin");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2159,22 +2159,22 @@ gint test_deviced_display_setautobrightnessmin(gint param1)
 gint test_deviced_display_setframerate(gint param1, gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setframerate",
                        g_variant_new("(ii)", param1, param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed setframerate");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2184,22 +2184,22 @@ gint test_deviced_display_setframerate(gint param1, gint param2)
 gint test_deviced_display_setbrightness(gint param1, gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setbrightness",
                        g_variant_new("(ii)", param1, param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed setbrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2209,22 +2209,22 @@ gint test_deviced_display_setbrightness(gint param1, gint param2)
 gint test_deviced_display_getbrightness(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "getbrightness",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed getbrightness");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2234,22 +2234,22 @@ gint test_deviced_display_getbrightness(gint param1)
 gint test_deviced_display_ChangeState(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "ChangeState",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ChangeState");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2259,22 +2259,22 @@ gint test_deviced_display_ChangeState(const gchar *param1)
 gint test_deviced_display_changestate(const gchar *param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "changestate",
                        g_variant_new("(s)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed changestate");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2284,22 +2284,22 @@ gint test_deviced_display_changestate(const gchar *param1)
 gint test_deviced_display_unlockstate(const gchar *param1, const gchar *param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "unlockstate",
                        g_variant_new("(ss)", param1, param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed unlockstate");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2309,22 +2309,22 @@ gint test_deviced_display_unlockstate(const gchar *param1, const gchar *param2)
 gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, const gchar *param3, gint param4)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "lockstate",
                        g_variant_new("(sssi)", param1, param2, param3, param4),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed lockstate");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2333,19 +2333,19 @@ gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, co
 
 void test_deviced_display_stop(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "stop",
                        NULL,
-                       &ret);;
-       if (err < 0)
+                       &reply);;
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 
 }
 
@@ -2353,19 +2353,19 @@ void test_deviced_display_stop(void)
 
 void test_deviced_display_start(void)
 {
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "start",
                        NULL,
-                       &ret);;
-       if (err < 0)
+                       &reply);;
+       if (ret_dbus < 0)
                return;
-       if (ret)
-               g_variant_unref(ret);
+       if (reply)
+               g_variant_unref(reply);
 
 }
 
@@ -2376,17 +2376,17 @@ void test_deviced_display_start(void)
 
 GVariant * test_deviced_Board_GetNum(void)
 {
-       GVariant *ret;
-       int err;
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       GVariant *reply;
+       int ret_dbus;
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Board",
                        "org.tizen.system.deviced.Board",
                        "GetNum",
                        NULL,
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return NULL;
-       return ret;
+       return reply;
 }
 
 // GetHWRev : in , out i
@@ -2394,22 +2394,22 @@ GVariant * test_deviced_Board_GetNum(void)
 gint test_deviced_Board_GetHWRev(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Board",
                        "org.tizen.system.deviced.Board",
                        "GetHWRev",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetHWRev");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2418,17 +2418,17 @@ gint test_deviced_Board_GetHWRev(void)
 
 GVariant * test_deviced_Board_GetSerial(void)
 {
-       GVariant *ret;
-       int err;
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       GVariant *reply;
+       int ret_dbus;
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Board",
                        "org.tizen.system.deviced.Board",
                        "GetSerial",
                        NULL,
-                       &ret);
-       if (err < 0)
+                       &reply);
+       if (ret_dbus < 0)
                return NULL;
-       return ret;
+       return reply;
 }
 
 // /Org/Tizen/System/DeviceD/PmQos
@@ -2439,22 +2439,22 @@ GVariant * test_deviced_Board_GetSerial(void)
 gint test_deviced_PmQos_MyfilesScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MyfilesScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed MyfilesScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2464,22 +2464,22 @@ gint test_deviced_PmQos_MyfilesScroll(gint param1)
 gint test_deviced_PmQos_CallLogScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CallLogScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CallLogScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2489,22 +2489,22 @@ gint test_deviced_PmQos_CallLogScroll(gint param1)
 gint test_deviced_PmQos_TizenStoreScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "TizenStoreScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed TizenStoreScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2514,22 +2514,22 @@ gint test_deviced_PmQos_TizenStoreScroll(gint param1)
 gint test_deviced_PmQos_ContactScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ContactScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ContactScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2539,22 +2539,22 @@ gint test_deviced_PmQos_ContactScroll(gint param1)
 gint test_deviced_PmQos_EmailScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "EmailScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed EmailScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2564,22 +2564,22 @@ gint test_deviced_PmQos_EmailScroll(gint param1)
 gint test_deviced_PmQos_VideoScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "VideoScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed VideoScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2589,22 +2589,22 @@ gint test_deviced_PmQos_VideoScroll(gint param1)
 gint test_deviced_PmQos_FileScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "FileScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed FileScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2614,22 +2614,22 @@ gint test_deviced_PmQos_FileScroll(gint param1)
 gint test_deviced_PmQos_MusicScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MusicScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed MusicScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2639,22 +2639,22 @@ gint test_deviced_PmQos_MusicScroll(gint param1)
 gint test_deviced_PmQos_UgLaunch(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "UgLaunch",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed UgLaunch");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2664,22 +2664,22 @@ gint test_deviced_PmQos_UgLaunch(gint param1)
 gint test_deviced_PmQos_SensorWakeup(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "SensorWakeup",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed SensorWakeup");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2689,22 +2689,22 @@ gint test_deviced_PmQos_SensorWakeup(gint param1)
 gint test_deviced_PmQos_WebAppFlick(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WebAppFlick",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed WebAppFlick");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2714,22 +2714,22 @@ gint test_deviced_PmQos_WebAppFlick(gint param1)
 gint test_deviced_PmQos_WebAppDrag(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WebAppDrag",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed WebAppDrag");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2739,22 +2739,22 @@ gint test_deviced_PmQos_WebAppDrag(gint param1)
 gint test_deviced_PmQos_PowerOff(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "PowerOff",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed PowerOff");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2764,22 +2764,22 @@ gint test_deviced_PmQos_PowerOff(gint param1)
 gint test_deviced_PmQos_WifiThroughput(gint param1, gint param2)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WifiThroughput",
                        g_variant_new("(ii)", param1, param2),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed WifiThroughput");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2789,22 +2789,22 @@ gint test_deviced_PmQos_WifiThroughput(gint param1, gint param2)
 gint test_deviced_PmQos_WebappLaunch(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WebappLaunch",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed WebappLaunch");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2814,22 +2814,22 @@ gint test_deviced_PmQos_WebappLaunch(gint param1)
 gint test_deviced_PmQos_SVoice(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "SVoice",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed SVoice");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2839,22 +2839,22 @@ gint test_deviced_PmQos_SVoice(gint param1)
 gint test_deviced_PmQos_SmemoZoom(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "SmemoZoom",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed SmemoZoom");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2864,22 +2864,22 @@ gint test_deviced_PmQos_SmemoZoom(gint param1)
 gint test_deviced_PmQos_ScreenMirroring(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ScreenMirroring",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ScreenMirroring");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2889,22 +2889,22 @@ gint test_deviced_PmQos_ScreenMirroring(gint param1)
 gint test_deviced_PmQos_ReservedMode(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ReservedMode",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ReservedMode");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2914,22 +2914,22 @@ gint test_deviced_PmQos_ReservedMode(gint param1)
 gint test_deviced_PmQos_ProcessCrashed(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ProcessCrashed",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ProcessCrashed");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2939,22 +2939,22 @@ gint test_deviced_PmQos_ProcessCrashed(gint param1)
 gint test_deviced_PmQos_PowerSaving(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "PowerSaving",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed PowerSaving");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2964,22 +2964,22 @@ gint test_deviced_PmQos_PowerSaving(gint param1)
 gint test_deviced_PmQos_MusicPlayLcdOn(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MusicPlayLcdOn",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed MusicPlayLcdOn");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -2989,22 +2989,22 @@ gint test_deviced_PmQos_MusicPlayLcdOn(gint param1)
 gint test_deviced_PmQos_MtpSendFile(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MtpSendFile",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed MtpSendFile");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3014,22 +3014,22 @@ gint test_deviced_PmQos_MtpSendFile(gint param1)
 gint test_deviced_PmQos_LowBattery(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "LowBattery",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed LowBattery");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3039,22 +3039,22 @@ gint test_deviced_PmQos_LowBattery(gint param1)
 gint test_deviced_PmQos_LockScreen(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "LockScreen",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed LockScreen");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3064,22 +3064,22 @@ gint test_deviced_PmQos_LockScreen(gint param1)
 gint test_deviced_PmQos_IMEInput(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "IMEInput",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed IMEInput");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3089,22 +3089,22 @@ gint test_deviced_PmQos_IMEInput(gint param1)
 gint test_deviced_PmQos_ImageViewer(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ImageViewer",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ImageViewer");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3114,22 +3114,22 @@ gint test_deviced_PmQos_ImageViewer(gint param1)
 gint test_deviced_PmQos_HomeScreen(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "HomeScreen",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed HomeScreen");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3139,22 +3139,22 @@ gint test_deviced_PmQos_HomeScreen(gint param1)
 gint test_deviced_PmQos_GpuWakeup(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GpuWakeup",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GpuWakeup");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3164,22 +3164,22 @@ gint test_deviced_PmQos_GpuWakeup(gint param1)
 gint test_deviced_PmQos_GpuBoost(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GpuBoost",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GpuBoost");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3189,22 +3189,22 @@ gint test_deviced_PmQos_GpuBoost(gint param1)
 gint test_deviced_PmQos_GpsSerialCno(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GpsSerialCno",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GpsSerialCno");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3214,22 +3214,22 @@ gint test_deviced_PmQos_GpsSerialCno(gint param1)
 gint test_deviced_PmQos_GetDefaultLockTime(void)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GetDefaultLockTime",
                        NULL,
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GetDefaultLockTime");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3239,22 +3239,22 @@ gint test_deviced_PmQos_GetDefaultLockTime(void)
 gint test_deviced_PmQos_GalleryRotation(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GalleryRotation",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GalleryRotation");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3264,22 +3264,22 @@ gint test_deviced_PmQos_GalleryRotation(gint param1)
 gint test_deviced_PmQos_GalleryScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GalleryScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed GalleryScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3289,22 +3289,22 @@ gint test_deviced_PmQos_GalleryScroll(gint param1)
 gint test_deviced_PmQos_Emergency(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "Emergency",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed Emergency");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3314,22 +3314,22 @@ gint test_deviced_PmQos_Emergency(gint param1)
 gint test_deviced_PmQos_ContactSearch(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ContactSearch",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed ContactSearch");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3339,22 +3339,22 @@ gint test_deviced_PmQos_ContactSearch(gint param1)
 gint test_deviced_PmQos_CameraSoundAndShot(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraSoundAndShot",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CameraSoundAndShot");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3364,22 +3364,22 @@ gint test_deviced_PmQos_CameraSoundAndShot(gint param1)
 gint test_deviced_PmQos_CameraRecording(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraRecording",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CameraRecording");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3389,22 +3389,22 @@ gint test_deviced_PmQos_CameraRecording(gint param1)
 gint test_deviced_PmQos_CameraPreview(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraPreview",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CameraPreview");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3414,22 +3414,22 @@ gint test_deviced_PmQos_CameraPreview(gint param1)
 gint test_deviced_PmQos_CameraCaptureAtRec(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraCaptureAtRec",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CameraCaptureAtRec");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3439,22 +3439,22 @@ gint test_deviced_PmQos_CameraCaptureAtRec(gint param1)
 gint test_deviced_PmQos_CameraBurstShot(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraBurstShot",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CameraBurstShot");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3464,22 +3464,22 @@ gint test_deviced_PmQos_CameraBurstShot(gint param1)
 gint test_deviced_PmQos_CallSound(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CallSound",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed CallSound");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3489,22 +3489,22 @@ gint test_deviced_PmQos_CallSound(gint param1)
 gint test_deviced_PmQos_BrowserScroll(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserScroll",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed BrowserScroll");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3514,22 +3514,22 @@ gint test_deviced_PmQos_BrowserScroll(gint param1)
 gint test_deviced_PmQos_BrowserLoading(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserLoading",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed BrowserLoading");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3539,22 +3539,22 @@ gint test_deviced_PmQos_BrowserLoading(gint param1)
 gint test_deviced_PmQos_BrowserJavaScript(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserJavaScript",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed BrowserJavaScript");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3564,22 +3564,22 @@ gint test_deviced_PmQos_BrowserJavaScript(gint param1)
 gint test_deviced_PmQos_BrowserDash(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserDash",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed BrowserDash");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3589,22 +3589,22 @@ gint test_deviced_PmQos_BrowserDash(gint param1)
 gint test_deviced_PmQos_Browser(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "Browser",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed Browser");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3614,22 +3614,22 @@ gint test_deviced_PmQos_Browser(gint param1)
 gint test_deviced_PmQos_BeautyShot(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BeautyShot",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed BeautyShot");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3639,22 +3639,22 @@ gint test_deviced_PmQos_BeautyShot(gint param1)
 gint test_deviced_PmQos_AppLaunchHome(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "AppLaunchHome",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed AppLaunchHome");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
@@ -3664,22 +3664,22 @@ gint test_deviced_PmQos_AppLaunchHome(gint param1)
 gint test_deviced_PmQos_AppLaunch(gint param1)
 {
        gint val1;
-       GVariant *ret;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "AppLaunch",
                        g_variant_new("(i)", param1),
-                       &ret);;
-       if (err < 0) {
+                       &reply);;
+       if (ret_dbus < 0) {
                _E("failed AppLaunch");
                return 0;
        }
 
-       g_variant_get(ret, "(i)", &val1);
-       g_variant_unref(ret);
+       g_variant_get(reply, "(i)", &val1);
+       g_variant_unref(reply);
 
        return val1;
 }
\ No newline at end of file

diff --git a/src/auto-test/time.c b/src/auto-test/time.c
index 04cba10..5313995 100755 (executable)
--- a/src/auto-test/time.c
+++ b/src/auto-test/time.c
@@ -22,36 +22,36 @@
 
 static bool request_sysnoti_method(const char *method, GVariant *param)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                method,
                                                param,
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                _E("fail (%s): no reply", method);
                return ret;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail (%s): no message", method);
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! (%s): %d", method, val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! (%s): %d", method, reply_val);
                        ret = TRUE;
-               } else if (val < 0) {
-                       _E("fail (%s): returned fail (%d)", method, val);
+               } else if (reply_val < 0) {
+                       _E("fail (%s): returned fail (%d)", method, reply_val);
                } else {
-                       _I("success (%s): %d", method, val);
+                       _I("success (%s): %d", method, reply_val);
                        ret = TRUE;
                }
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        return ret;
 }
 

diff --git a/src/auto-test/udev.c b/src/auto-test/udev.c
index 8b52c19..06d047c 100644 (file)
--- a/src/auto-test/udev.c
+++ b/src/auto-test/udev.c
@@ -27,45 +27,45 @@ static const struct device_change_type {
 
 static int udev(int index)
 {
-       GVariant *msg;
-       int ret = 0, val = 0, err;
+       GVariant *reply;
+       int ret = 0, reply_val = 0, ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_SYSNOTI,
                        DEVICED_INTERFACE_SYSNOTI,
                        "udev",
                        g_variant_new("(sis)", "udev", 1, device_change_types[index].status),
-                       &msg);
-       if (err < 0) {
+                       &reply);
+       if (ret_dbus < 0) {
                _E("fail : %s %s %s %s",
                        DEVICED_BUS_NAME, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI,
                        "udev");
                return -EBADMSG;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val))
+       if (!g_variant_get_safe(reply, "(i)", &reply_val))
                _E("fail : no message");
        else {
-               if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-                       _I("Not supported feature! : %d", val);
+               if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+                       _I("Not supported feature! : %d", reply_val);
                        ret = TRUE;
-               } else if (val < 0) {
-                       _E("fail : returned fail (%d)", val);
+               } else if (reply_val < 0) {
+                       _E("fail : returned fail (%d)", reply_val);
                } else {
-                       _I("success : %d", val);
+                       _I("success : %d", reply_val);
                        ret = TRUE;
                }
        }
 
        _I("%s", device_change_types[index].status);
-       if (val < 0)
+       if (reply_val < 0)
                _R("[NG] ---- %s             : %s",
                __func__, device_change_types[index].status);
        else
                _R("[OK] ---- %s             : %s",
                __func__, device_change_types[index].status);
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
        sleep(TEST_WAIT_TIME_INTERVAL);
        return ret;
 }

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index 8b1545b..edb8e7b 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -196,14 +196,14 @@ out:
 
 static void noti_off_cb(GVariant *var, void *user_data, GError *err)
 {
-       int ret = 0;
+       int val = 0;
 
-       if (!g_variant_get_safe(var, "(i)", &ret)) {
+       if (!g_variant_get_safe(var, "(i)", &val)) {
                _E("Failed to off notification: no message(%s)", g_variant_get_type_string(var));
                goto out;
        }
 
-       _D("Noti off: %d", ret);
+       _D("Noti off: %d", val);
 
 out:
        g_variant_unref(var);
@@ -300,7 +300,7 @@ static void power_supply_noti(enum battery_noti_type type, enum battery_noti_sta
 {
        static int charger = CHARGER_DISCHARGING;
        static int full = CHARGING_NOT_FULL;
-       int ret;
+       int ret_val;
 
        if (type == DEVICE_NOTI_BATT_CHARGE) {
                if (status == DEVICE_NOTI_ON && charger == CHARGER_DISCHARGING) {
@@ -310,12 +310,12 @@ static void power_supply_noti(enum battery_noti_type type, enum battery_noti_sta
                        charger = CHARGER_DISCHARGING;
        } else if (type == DEVICE_NOTI_BATT_FULL) {
                if (status == DEVICE_NOTI_ON && full == CHARGING_NOT_FULL) {
-                       ret = send_full_noti(CHARGING_FULL);
-                       if (ret == 0)
+                       ret_val = send_full_noti(CHARGING_FULL);
+                       if (ret_val == 0)
                                full = CHARGING_FULL;
                } else if (status == DEVICE_NOTI_OFF && full == CHARGING_FULL) {
-                       ret = send_full_noti(CHARGING_NOT_FULL);
-                       if (ret == 0)
+                       ret_val = send_full_noti(CHARGING_NOT_FULL);
+                       if (ret_val == 0)
                                full = CHARGING_NOT_FULL;
                }
        }
@@ -558,16 +558,16 @@ static void check_abnormal_status(void)
 static bool update_online(void)
 {
        int chg_on;
-       int ret;
+       int ret_val;
        bool broadcast = false;
 
        if (battery.online <= POWER_SUPPLY_TYPE_BATTERY &&
            battery.charger_charging == CHARGER_DISABLED) {
                battery.charger_charging = CHARGER_ENABLED;
-               ret = sys_get_int(CHARGER_CHARGE_ON_NODE, &chg_on);
-               if (ret == 0 && battery.charger_charging != chg_on) {
-                       ret = sys_set_int(CHARGER_CHARGE_ON_NODE, battery.charger_charging);
-                       _I("%s to change status with %d", ((ret == 0) ? "success" : "fail"), battery.charger_charging);
+               ret_val = sys_get_int(CHARGER_CHARGE_ON_NODE, &chg_on);
+               if (ret_val == 0 && battery.charger_charging != chg_on) {
+                       ret_val = sys_set_int(CHARGER_CHARGE_ON_NODE, battery.charger_charging);
+                       _I("%s to change status with %d", ((ret_val == 0) ? "success" : "fail"), battery.charger_charging);
                }
        }
 
@@ -751,14 +751,14 @@ static void process_power_supply(void *data)
 {
        bool broadcasted = true;
        int lock = -1;
-       int ret;
+       int ret_val;
 
        _D("process_power_supply()");
        if (disp_plgn->pm_lock_internal) {
                lock = disp_plgn->pm_lock_internal(INTERNAL_LOCK_BATTERY, LCD_OFF, STAY_CUR_STATE, 0);
        if (old_battery.charge_now != battery.charge_now || battery.charge_now == CHARGER_ABNORMAL) {
-                       ret = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, battery.charge_now);
-                       if (ret < 0)
+                       ret_val = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, battery.charge_now);
+                       if (ret_val < 0)
                                _E("Failed to set vconf value for battery charge now: %d", vconf_get_ext_errno());
 
                        if (power_supply_broadcast(CHARGE_NOW_SIGNAL, battery.charge_now) < 0)
@@ -782,8 +782,8 @@ static void process_power_supply(void *data)
        }
 
        if (old_battery.capacity != battery.capacity) {
-               ret = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, battery.capacity);
-               if (ret < 0)
+               ret_val = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, battery.capacity);
+               if (ret_val < 0)
                        _E("Failed to set vconf value for battery capacity: %d", vconf_get_ext_errno());
 
                if (power_supply_broadcast(CHARGE_CAPACITY_SIGNAL, battery.capacity) < 0)
@@ -793,8 +793,8 @@ static void process_power_supply(void *data)
        (void)lowbat_execute(data);
 
        if (update_online()) {
-               ret = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_STATUS, online_status);
-               if (ret < 0)
+               ret_val = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_STATUS, online_status);
+               if (ret_val < 0)
                        _E("Failed to set vconf value for charger status: %d", vconf_get_ext_errno());
 
                if (power_supply_broadcast(CHARGER_STATUS_SIGNAL, online_status) < 0)
@@ -802,8 +802,8 @@ static void process_power_supply(void *data)
        }
 
        if (old_battery.online_type != battery.online_type) {
-               ret = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_TYPE, battery.online_type);
-               if (ret < 0)
+               ret_val = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_TYPE, battery.online_type);
+               if (ret_val < 0)
                        _E("Failed to set vconf value for charger type: %d", vconf_get_ext_errno());
 
                if (power_supply_broadcast(CHARGER_TYPE_SIGNAL, battery.online_type) < 0)
@@ -872,7 +872,7 @@ static void uevent_power_handler(struct udev_device *dev)
        const char *env_name;
        const char *env_value;
        bool matched = false;
-       int ret;
+       int ret_val;
 
        udev_list_entry_foreach(list_entry,
                        udev_device_get_properties_list_entry(dev)) {
@@ -912,8 +912,8 @@ static void uevent_power_handler(struct udev_device *dev)
 
        battery_initialized = true;
 
-       ret = booting_done(NULL);
-       if (ret) {
+       ret_val = booting_done(NULL);
+       if (ret_val) {
                if (battery.online > POWER_SUPPLY_TYPE_BATTERY)
                        power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_ON);
                else
@@ -968,7 +968,7 @@ static int battery_state(struct battery_info *info)
 
 static void battery_changed(struct battery_info *info, void *data)
 {
-       int ret;
+       int ret_val;
 
        if (!info) {
                (void)battery_state(NULL);
@@ -1007,12 +1007,12 @@ static void battery_changed(struct battery_info *info, void *data)
 
        battery_initialized = true;
 
-       ret = battery_state(info);
-       if (ret != 1)
+       ret_val = battery_state(info);
+       if (ret_val != 1)
                return;
 
-       ret = booting_done(NULL);
-       if (ret) {
+       ret_val = booting_done(NULL);
+       if (ret_val) {
                /* If the same notification is requested repeatedly, it is ignored by power_supply_noti().
                 * A notification will be triggered only when charge_status changes between
                 * CHARGE_STATUS_CHARGING/FULL <-> CHARGE_STATUS_DISCHARGING. */
@@ -1022,7 +1022,7 @@ static void battery_changed(struct battery_info *info, void *data)
                        power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_OFF);
        }
 
-       if (ret == 0) {
+       if (ret_val == 0) {
                battery.health = HEALTH_GOOD;
                battery.present = PRESENT_NORMAL;
        }
@@ -1083,10 +1083,10 @@ static GVariant *dbus_get_charger_status(GDBusConnection *conn,
        const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
        GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
-       int ret, status;
+       int ret_val, status;
 
-       ret = vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &status);
-       if (ret < 0) {
+       ret_val = vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &status);
+       if (ret_val < 0) {
                _E("Failed to get vconf value for charger status: %d", vconf_get_ext_errno());
                status = -EIO;
        }
@@ -1597,14 +1597,14 @@ static int load_uevent(struct parse_result *result, void *user_data)
 
 static int power_supply_probe(void *data)
 {
-       int ret, r;
+       int ret_val, r;
 
 
        if (battery_dev_available)
                return 0;
 
-       ret = hal_device_battery_get_backend();
-       if (ret < 0) {
+       ret_val = hal_device_battery_get_backend();
+       if (ret_val < 0) {
                _E("There is no HAL for battery.");
                battery_dev_available = false;
                if (access(POWER_PATH, R_OK) == 0)
@@ -1631,21 +1631,21 @@ out:
        r = vconf_set_int(VCONFKEY_SYSMAN_BATTERY_LEVEL_STATUS, -ENOTSUP);
        if (r < 0)
                _E("Failed to set vconf value for battery level status: %d", vconf_get_ext_errno());
-       _I("There is no battery device: %d", ret);
+       _I("There is no battery device: %d", ret_val);
        return -ENODEV;
 }
 
 static void add_power_supply_handler(void)
 {
-       int ret;
+       int ret_val;
 
        if (battery_dev_available) {
                hal_device_battery_register_changed_event(battery_changed, NULL);
                hal_device_battery_get_current_state(battery_changed, NULL);
        } else {
-               ret = config_parse(POWER_SUPPLY_UEVENT, load_uevent, &battery);
-               if (ret < 0)
-                       _E("Failed to load %s, %d Use default value!", POWER_SUPPLY_UEVENT, ret);
+               ret_val = config_parse(POWER_SUPPLY_UEVENT, load_uevent, &battery);
+               if (ret_val < 0)
+                       _E("Failed to load %s, %d Use default value!", POWER_SUPPLY_UEVENT, ret_val);
 
                /* register power subsystem */
                register_kernel_uevent_control(&uh);
@@ -1679,7 +1679,7 @@ static int event_handler_state_changed(void *data)
 
 static void power_supply_init(void *data)
 {
-       int ret;
+       int ret_dbus;
 
        memset(&battery, 0, sizeof(struct battery_status));
        memset(&old_battery, 0, sizeof(struct battery_status));
@@ -1696,9 +1696,9 @@ static void power_supply_init(void *data)
        register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
        register_notifier(DEVICE_NOTIFIER_EVENT_HANDLER, event_handler_state_changed);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
-       if (ret < 0)
-               _E("Failed to init dbus method: %d", ret);
+       ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
+       if (ret_dbus < 0)
+               _E("Failed to init dbus method: %d", ret_dbus);
 
        battery_ops_init((void *)battery_plgn);
 }

diff --git a/src/devicectl/devicectl.c b/src/devicectl/devicectl.c
index 52a99ea..80cb678 100644 (file)
--- a/src/devicectl/devicectl.c
+++ b/src/devicectl/devicectl.c
@@ -63,57 +63,57 @@ static const struct device {
 
 static int start_device(char **args)
 {
-       GVariant *msg;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
        if (!args[1])
                return -EINVAL;
 
        printf("Start %s device.\n", args[1]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                devices[arg_id].path,
                devices[arg_id].iface,
                "start",
                NULL,
-               &msg);
-       if (err < 0)
+               &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return 0;
 }
 
 static int stop_device(char **args)
 {
-       GVariant *msg;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
        if (!args[1])
                return -EINVAL;
 
        printf("Stop %s device.\n", args[1]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "stop",
                                                NULL,
-                                               &msg);
-       if (err < 0)
+                                               &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return 0;
 }
 
 static int dump_mode(char **args)
 {
-       GVariant *msg;
+       GVariant *reply;
        int ret = -EBADMSG;
-       int err;
+       int ret_dbus;
 
        if (!args[1] || !args[2] || !args[3]) {
                ret = -EINVAL;
@@ -122,24 +122,24 @@ static int dump_mode(char **args)
 
        printf("%s (%s %s).\n", args[1], args[2], args[3]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                        devices[arg_id].path,
                                        devices[arg_id].iface,
                                        "Dumpmode",
                                        g_variant_new("(s)", args[3]),
-                                       &msg);
-       if (err < 0) {
+                                       &reply);
+       if (ret_dbus < 0) {
                printf("Failed to set dump mode");
                ret = -EBADMSG;
                goto out;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &ret)) {
-               printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
+       if (!g_variant_get_safe(reply, "(i)", &ret)) {
+               printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
                ret = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
 out:
        return ret;
@@ -147,9 +147,9 @@ out:
 
 static int display_state(char **args)
 {
-       GVariant *msg;
+       GVariant *reply;
        int ret = -EBADMSG;
-       int err;
+       int ret_dbus;
 
        if (!args[1] || !args[2] || !args[3]) {
                ret = -EINVAL;
@@ -158,25 +158,25 @@ static int display_state(char **args)
 
        printf("%s (%s %s)!\n", args[1], args[2], args[3]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                    devices[arg_id].path,
                    devices[arg_id].iface,
                    "changestate",
                    g_variant_new("(s)", args[3]),
-                       &msg);
+                       &reply);
 
-       if (err < 0) {
+       if (ret_dbus < 0) {
                printf("Failed to set display state");
                ret = -EBADMSG;
                goto out;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &ret)) {
-               printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
+       if (!g_variant_get_safe(reply, "(i)", &ret)) {
+               printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
                ret = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
 out:
        return ret;
@@ -184,26 +184,26 @@ out:
 
 static int save_log(char **args)
 {
-       GVariant *msg;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
        if (!args[1])
                return -EINVAL;
 
        printf("Save log %s device.\n", args[1]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                devices[arg_id].path,
                                devices[arg_id].iface,
                                "SaveLog",
                                NULL,
-                               &msg);
-       if (err < 0) {
+                               &reply);
+       if (ret_dbus < 0) {
                printf("Failed to save log");
                return -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return 0;
 }
@@ -231,32 +231,32 @@ static void get_pname(pid_t pid, char *pname)
 
 static int save_dbus_name(char **args)
 {
-       GVariant *msg;
+       GVariant *reply;
        GVariantIter *iter;
        char *str;
        pid_t pid;
        char pname[PATH_MAX];
-       int err;
+       int ret_dbus;
 
        if (!args[1])
                return -EINVAL;
 
        printf("Save dbus name.\n");
 
-       err = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME,
                                                DBUS_OBJECT_PATH,
                                                DBUS_INTERFACE_NAME,
                                                "ListNames",
                                                NULL,
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                printf("Failed to get list names.");
                return -EBADMSG;
        }
 
-       if (!g_variant_get_safe(msg, "(as)", &iter)) {
+       if (!g_variant_get_safe(reply, "(as)", &iter)) {
                printf("Invalid list name arguments.");
-               g_variant_unref(msg);
+               g_variant_unref(reply);
                return -EINVAL;
        }
 
@@ -269,31 +269,31 @@ static int save_dbus_name(char **args)
        }
 
        g_variant_iter_free(iter);
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return 0;
 }
 
 static int device_list(char **args)
 {
-       GVariant *msg;
-       int err;
+       GVariant *reply;
+       int ret_dbus;
 
        if (!args[1])
                return -EINVAL;
 
        printf("Print %s to dlog.\n", args[1]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "DeviceList",
                                                NULL,
-                                               &msg);
-       if (err < 0)
+                                               &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
        return 0;
 }
@@ -310,9 +310,9 @@ static int unset_usb_mode(char **args)
 
 static int enable_device(char **args)
 {
-       GVariant *msg;
+       GVariant *reply;
        int ret = -EBADMSG;
-       int err;
+       int ret_dbus;
 
        if (!args[3]) {
                ret = -EINVAL;
@@ -321,23 +321,23 @@ static int enable_device(char **args)
 
        printf("Enable %s device.\n", args[3]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "enable",
                                                g_variant_new("(s)", args[3]),
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                ret = -EBADMSG;
                goto out;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &ret)) {
-               printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
+       if (!g_variant_get_safe(reply, "(i)", &ret)) {
+               printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
                ret = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
 out:
        return ret;
@@ -345,9 +345,9 @@ out:
 
 static int disable_device(char **args)
 {
-       GVariant *msg;
+       GVariant *reply;
        int ret = -EBADMSG;
-       int err;
+       int ret_dbus;
 
        if (!args[3]) {
                ret = -EINVAL;
@@ -356,23 +356,23 @@ static int disable_device(char **args)
 
        printf("Disable %s device.\n", args[3]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "disable",
                                                g_variant_new("(s)", args[3]),
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                ret = -EBADMSG;
                goto out;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &ret)) {
-               printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
+       if (!g_variant_get_safe(reply, "(i)", &ret)) {
+               printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
                ret = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
 out:
        return ret;
@@ -380,9 +380,9 @@ out:
 
 static int power_operation(char **args, char *type)
 {
-       GVariant *msg;
+       GVariant *reply;
        int ret = -EBADMSG;
-       int err;
+       int ret_dbus;
 
        if (!args[1] || !type) {
                ret = -EINVAL;
@@ -391,23 +391,23 @@ static int power_operation(char **args, char *type)
 
        printf("Power %s device.\n", args[2]);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "PowerOff",
                                                g_variant_new("(s)", type),
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_dbus < 0) {
                ret = -EBADMSG;
                goto out;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &ret)) {
-               printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
+       if (!g_variant_get_safe(reply, "(i)", &ret)) {
+               printf("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
                ret = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
 out:
        return ret;

diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c
index 27db29a..8f698c6 100644 (file)
--- a/src/extcon/extcon.c
+++ b/src/extcon/extcon.c
@@ -97,8 +97,8 @@ static int extcon_update(const char *name, const char *index, const char *value)
        struct extcon_ops *dev;
        char buf[BUF_MAX];
        int status;
-       int ret = 0;
-       int val;
+       int ret_dbus = 0;
+       int reply;
 
        if (!name || !value)
                return -EINVAL;
@@ -120,17 +120,17 @@ static int extcon_update(const char *name, const char *index, const char *value)
        if (dev->enabled == false && strncmp(name, "USB", strlen("USB")) == 0) {
                if (status > 0) {
                        snprintf(buf, BUF_MAX, "usb-client");
-                       ret = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME,
+                       ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME,
                                                        DEVICEMANAGER_PATH_POPUP,
                                                        DEVICEMANAGER_INTERFACE_POPUP,
                                                        METHOD_SYSPOPUP_SHOW,
                                                        g_variant_new("(s)", buf),
-                                                       &val);
-                       if (ret < 0){
-                               _E("Failed to launch USB restricted popup: %d", ret);
-                               return ret;
+                                                       &reply);
+                       if (ret_dbus < 0){
+                               _E("Failed to launch USB restricted popup: %d", ret_dbus);
+                               return ret_dbus;
                        }
-                       return val;
+                       return reply;
                } else
                        return 0;
        }
@@ -176,20 +176,20 @@ int extcon_disable_device(const char *name)
 {
        struct extcon_ops *dev;
        char buf[BUF_MAX];
-       int ret;
+       int ret_dbus;
 
        dev = find_extcon(name);
        if (!dev)
                return -ENODEV;
 
        snprintf(buf, BUF_MAX, "usb-client");
-       ret = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME,
                                        DEVICEMANAGER_PATH_POPUP,
                                        DEVICEMANAGER_INTERFACE_POPUP,
                                        METHOD_SYSPOPUP_SHOW,
                                        g_variant_new("(s)", buf), NULL);
-       if (ret < 0)
-               _E("Failed to launch USB restricted popup: %d", ret);
+       if (ret_dbus < 0)
+               _E("Failed to launch USB restricted popup: %d", ret_dbus);
 
        if (!dev->enabled) {
                _I("Extcon(%s) already disabled.", name);
@@ -235,14 +235,14 @@ static void uevent_extcon_handler(struct udev_device *dev)
 {
        const char *env_value;
        const char *dev_index;
-       int ret;
+       int ret_val;
 
        env_value = udev_device_get_property_value(dev, STATE_NAME);
        dev_index = udev_device_get_property_value(dev, DEVICE_TYPE);
 
-       ret = extcon_parsing_value(dev_index, env_value);
-       if (ret < 0)
-               _E("Failed to parse extcon value: %d", ret);
+       ret_val = extcon_parsing_value(dev_index, env_value);
+       if (ret_val < 0)
+               _E("Failed to parse extcon value: %d", ret_val);
 }
 
 static int extcon_load_uevent(struct parse_result *result, void *user_data)
@@ -385,13 +385,13 @@ static void extcon_changed(struct connection_info *info, void *data)
 
 static int extcon_probe(void *data)
 {
-       int ret;
+       int ret_val;
 
        if (extcon_dev_available)
                return 0;
 
-       ret = hal_device_external_connection_get_backend();
-       if (ret == 0) {
+       ret_val = hal_device_external_connection_get_backend();
+       if (ret_val == 0) {
                extcon_dev_available = true;
                _I("Extcon device structure load success.");
 
@@ -408,7 +408,7 @@ static int extcon_probe(void *data)
         */
        if (access(EXTCON_PATH, R_OK) != 0) {
                _E("There is no extcon class.");
-               return ret;
+               return ret_val;
        }
 
        return 0;
@@ -416,35 +416,35 @@ static int extcon_probe(void *data)
 
 static void add_extcon_event_handler(void)
 {
-       int ret;
+       int ret_val;
 
        if (extcon_dev_available) { /* HAL is used */
                hal_device_external_connection_register_changed_event(extcon_changed, NULL);
                hal_device_external_connection_get_current_state(extcon_changed, NULL);
        } else {
                /* register extcon uevent */
-               ret = register_kernel_uevent_control(&uh);
-               if (ret < 0)
-                       _E("Failed to register extcon uevent: %d", ret);
+               ret_val = register_kernel_uevent_control(&uh);
+               if (ret_val < 0)
+                       _E("Failed to register extcon uevent: %d", ret_val);
 
                /* load the initialize value by accessing the node directly */
-               ret = get_extcon_init_state();
-               if (ret < 0)
-                       _E("Failed to init extcon nodes: %d", ret);
+               ret_val = get_extcon_init_state();
+               if (ret_val < 0)
+                       _E("Failed to init extcon nodes: %d", ret_val);
        }
 }
 
 static void remove_extcon_event_handler(void)
 {
-       int ret;
+       int ret_val;
 
        if (extcon_dev_available)
                hal_device_external_connection_unregister_changed_event(extcon_changed);
        else {
                /* unreigster extcon uevent */
-               ret = unregister_kernel_uevent_control(&uh);
-               if (ret < 0)
-                       _E("Failed to unregister extcon uevent: %d", ret);
+               ret_val = unregister_kernel_uevent_control(&uh);
+               if (ret_val < 0)
+                       _E("Failed to unregister extcon uevent: %d", ret_val);
        }
 }
 
@@ -468,7 +468,7 @@ static int event_handler_state_changed(void *data)
 
 static void extcon_init(void *data)
 {
-       int ret;
+       int ret_dbus;
        GList *l;
        struct extcon_ops *dev;
        device_notifier_state_e state = DEVICE_NOTIFIER_STATE_START;
@@ -486,9 +486,9 @@ static void extcon_init(void *data)
 
        event_handler_state_changed((void *)&state);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface);
-       if (ret < 0)
-               _E("Failed to init dbus method: %d", ret);
+       ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface);
+       if (ret_dbus < 0)
+               _E("Failed to init dbus method: %d", ret_dbus);
 
 
        register_notifier(DEVICE_NOTIFIER_EVENT_HANDLER, event_handler_state_changed);

diff --git a/src/led/noti.c b/src/led/noti.c
index 796c9a0..bac00b6 100644 (file)
--- a/src/led/noti.c
+++ b/src/led/noti.c
@@ -30,47 +30,47 @@ static int noti_h;
 
 int ongoing_show(void)
 {
-       int ret_val, result;
+       int reply, ret_dbus;
        if (noti_h > 0) {
                _D("Already ongoing noti show handle(%d).", noti_h);
                return 0;
        }
 
-       result = dbus_handle_method_sync_var(POPUP_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME,
                        POPUP_PATH_NOTI,
                        POPUP_INTERFACE_NOTI,
                        METHOD_TORCH_NOTI_ON,
                        NULL,
-                       &ret_val);
+                       &reply);
 
-       if (result < 0)
-               return result;
+       if (ret_dbus < 0)
+               return ret_dbus;
 
-       noti_h = ret_val;
+       noti_h = reply;
        _D("Insert noti handle(%d).", noti_h);
        return 0;
 }
 
 int ongoing_clear(void)
 {
-       int ret_val, result;
+       int reply, ret_dbus;
        if (noti_h <= 0) {
                _D("Already ongoing noti clear.");
                return 0;
        }
 
-       result = dbus_handle_method_sync_var(POPUP_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME,
                        POPUP_PATH_LED,
                        POPUP_INTERFACE_LED,
                        METHOD_TORCH_NOTI_OFF,
                        g_variant_new("(i)", noti_h),
-                       &ret_val);
+                       &reply);
 
-       if (result < 0)
-               return result;
+       if (ret_dbus < 0)
+               return ret_dbus;
 
        _D("Delete noti handle(%d).", noti_h);
        noti_h = 0;
 
-       return ret_val;
+       return reply;
 }

diff --git a/src/libdeviced/deviced-noti.c b/src/libdeviced/deviced-noti.c
index c5e0aa0..5496e66 100644 (file)
--- a/src/libdeviced/deviced-noti.c
+++ b/src/libdeviced/deviced-noti.c
@@ -56,29 +56,29 @@
 
 static int dbus_proc_handler(char* type, char *buf)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_PROCESS,
                                                DEVICED_INTERFACE_PROCESS,
                                                type,
                                                g_variant_new("(sis)", type, 1, buf),
-                                               &msg);
-       if (err < 0)
+                                               &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
-               _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
-               val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
                goto out;
        }
 
-       _D("%s-%s: %d", DEVICED_INTERFACE_PROCESS, type, val);
+       _D("%s-%s: %d", DEVICED_INTERFACE_PROCESS, type, reply_val);
 
 out:
-       g_variant_unref(msg);
-       return val;
+       g_variant_unref(reply);
+       return reply_val;
 }
 
 API int deviced_inform_foregrd(void)
@@ -111,30 +111,30 @@ API int deviced_inform_inactive(pid_t pid)
 
 static int dbus_power_handler(char* type)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_POWEROFF,
                                                DEVICED_INTERFACE_POWEROFF,
                                                "PowerOff",
                                                g_variant_new("(s)", type),
-                                               &msg);
-       if (err < 0)
+                                               &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
-               _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
-               val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
                goto out;
        }
 
-       _D("%s-%s: %d", DEVICED_INTERFACE_POWER, type, val);
+       _D("%s-%s: %d", DEVICED_INTERFACE_POWER, type, reply_val);
 
 out:
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
-       return val;
+       return reply_val;
 }
 
 API int deviced_request_poweroff(void)
@@ -149,73 +149,73 @@ API int deviced_request_reboot(void)
 
 static int dbus_time_handler(char* type, char* buf)
 {
-       GVariant *msg;
+       GVariant *reply;
        pid_t pid;
        char name[PATH_MAX];
-       int ret, val, err;
+       int ret_val, reply_val;
 
        pid = getpid();
-       ret = deviced_get_cmdline_name(pid, name, sizeof(name));
-       if (ret != 0)
+       ret_val = deviced_get_cmdline_name(pid, name, sizeof(name));
+       if (ret_val != 0)
                snprintf(name, sizeof(name), "%d", pid);
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_val = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                type,
                                                g_variant_new("(sis)", type, 1, buf),
-                                               &msg);
-       if (err < 0)
+                                               &reply);
+       if (ret_val < 0)
                return -EBADMSG;
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
-               _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
-               val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
                goto out;
        }
 
-       _SI("[%s] %s-%s(%s): %d", name, DEVICED_INTERFACE_SYSNOTI, type, buf, val);
+       _SI("[%s] %s-%s(%s): %d", name, DEVICED_INTERFACE_SYSNOTI, type, buf, reply_val);
 out:
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
-       return val;
+       return reply_val;
 }
 
 static int alarm_set_time(time_t timet)
 {
-       GVariant *msg;
+       GVariant *reply;
        pid_t pid;
        char name[PATH_MAX];
-       int ret, val, err;
+       int ret_val, reply_val;
 
        pid = getpid();
-       ret = deviced_get_cmdline_name(pid, name, sizeof(name));
-       if (ret != 0)
+       ret_val = deviced_get_cmdline_name(pid, name, sizeof(name));
+       if (ret_val != 0)
                snprintf(name, sizeof(name), "%d", pid);
        _SI("[%s]start %s %ld.", name, ALARM_INTERFACE_NAME, timet);
 
-       err = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME,
+       ret_val = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME,
                                                ALARM_PATH_NAME,
                                                ALARM_INTERFACE_NAME,
                                                ALARM_SET_TIME_METHOD,
                                                g_variant_new("(i)", timet),
-                                               &msg);
-       if (err < 0) {
+                                               &reply);
+       if (ret_val < 0) {
                _E("Failed to call dbus_message_new_method_call(%s:%s-%s).",
                        ALARM_PATH_NAME, ALARM_INTERFACE_NAME, ALARM_SET_TIME_METHOD);
                return -EBADMSG;
        }
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
-               _E("Failed to get type(%s): no message", g_variant_get_type_string(msg));
-               val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get type(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
        }
 
-       _SI("[%s]End %s %ld: %d", name, ALARM_INTERFACE_NAME, timet, val);
+       _SI("[%s]End %s %ld: %d", name, ALARM_INTERFACE_NAME, timet, reply_val);
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
-       return val;
+       return reply_val;
 }
 
 API int deviced_set_datetime(time_t timet)
@@ -236,28 +236,28 @@ API int deviced_set_timezone(char *tzpath_str)
 
 static int dbus_cpu_handler(char* type, char* buf_pid, char* buf_freq)
 {
-       GVariant *msg;
-       int val, err;
+       GVariant *reply;
+       int reply_val, ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                type,
                                                g_variant_new("(siss)", type, 2, buf_pid, buf_freq),
-                                               &msg);
-       if (err < 0)
+                                               &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       if (!g_variant_get_safe(msg, "(i)", &val)) {
-               _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
-               val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
                goto out;
        }
 
-       _D("%s-%s: %d", DEVICED_INTERFACE_SYSNOTI, type, val);
+       _D("%s-%s: %d", DEVICED_INTERFACE_SYSNOTI, type, reply_val);
 out:
-       g_variant_unref(msg);
-       return val;
+       g_variant_unref(reply);
+       return reply_val;
 }
 
 API int deviced_request_set_cpu_max_frequency(int val)

diff --git a/src/libdeviced/display.c b/src/libdeviced/display.c
index 6cb37d6..06f276b 100644 (file)
--- a/src/libdeviced/display.c
+++ b/src/libdeviced/display.c
@@ -61,18 +61,18 @@
 
 API int display_get_max_brightness(void)
 {
-       int ret, val;
+       int reply, ret_dbus;
 
-       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                                DEVICED_PATH_DISPLAY,
                                DEVICED_INTERFACE_DISPLAY,
                                METHOD_GET_MAX_BRIGHTNESS,
-                               g_variant_new("(i)", DISPLAY_STATE_NORMAL), &val);
-       if (ret < 0)
+                               g_variant_new("(i)", DISPLAY_STATE_NORMAL), &reply);
+       if (ret_dbus < 0)
                return DISPLAY_MAX_BRIGHTNESS;
 
-       _D("Get max brightness: %d", val);
-       return val;
+       _D("Get max brightness: %d", reply);
+       return reply;
 }
 
 API int display_set_brightness_with_setting(int val)

diff --git a/src/libdeviced/led.c b/src/libdeviced/led.c
index 7a0d24c..8d09a25 100644 (file)
--- a/src/libdeviced/led.c
+++ b/src/libdeviced/led.c
@@ -32,73 +32,73 @@
 
 API int led_get_brightness(void)
 {
-       GVariant *msg = NULL;
-       int ret_val = 0;
-       int err;
+       GVariant *reply = NULL;
+       int reply_val = 0;
+       int ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_LED,
                                        DEVICED_INTERFACE_LED,
                                        METHOD_GET_BRIGHTNESS,
                                        NULL,
-                                       &msg);
-       if (err < 0)
+                                       &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       if (!g_variant_get_safe(msg, "(i)", &ret_val)) {
-               _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
-               ret_val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
-       return ret_val;
+       return reply_val;
 }
 
 API int led_get_max_brightness(void)
 {
-       GVariant *msg = NULL;
-       int ret_val, err;
+       GVariant *reply = NULL;
+       int reply_val, ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_LED,
                                        DEVICED_INTERFACE_LED,
                                        METHOD_GET_MAX_BRIGHTNESS,
                                        NULL,
-                                       &msg);
-       if (err < 0)
+                                       &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       if (!g_variant_get_safe(msg, "(i)", &ret_val)) {
-               _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
-               ret_val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
-       return ret_val;
+       return reply_val;
 }
 
 API int led_set_brightness_with_noti(int val, bool enable)
 {
-       GVariant *msg = NULL;
-       int ret_val, err;
+       GVariant *reply = NULL;
+       int reply_val, ret_dbus;
 
-       err = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
                                                DEVICED_PATH_LED,
                                                DEVICED_INTERFACE_LED,
                                                METHOD_SET_BRIGHTNESS,
                                                g_variant_new("(ii)", val, enable),
-                                               &msg);
-       if (err < 0)
+                                               &reply);
+       if (ret_dbus < 0)
                return -EBADMSG;
 
-       if (!g_variant_get_safe(msg, "(i)", &ret_val)) {
-               _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
-               ret_val = -EBADMSG;
+       if (!g_variant_get_safe(reply, "(i)", &reply_val)) {
+               _E("Failed to get signature(%s): no message", g_variant_get_type_string(reply));
+               reply_val = -EBADMSG;
        }
 
-       g_variant_unref(msg);
+       g_variant_unref(reply);
 
-       return ret_val;
+       return reply_val;
 }

diff --git a/src/libdeviced/usbhost.c b/src/libdeviced/usbhost.c
index 8a6d5a2..5e55845 100644 (file)
--- a/src/libdeviced/usbhost.c
+++ b/src/libdeviced/usbhost.c
@@ -204,16 +204,16 @@ API void deinit_usbhost_signal(void)
 
 API int request_usb_storage_info(void)
 {
-       int ret, err;
-       err = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       int reply, ret_dbus;
+       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                                DEVICED_PATH_USBHOST,
                                DEVICED_INTERFACE_USBHOST,
                                METHOD_REQUEST_STORAGE_INFO_ALL,
                                NULL,
-                               &ret);
-       if(err < 0)
-               return err;
-       return ret;
+                               &reply);
+       if(ret_dbus < 0)
+               return ret_dbus;
+       return reply;
 }
 
 API int register_usb_storage_change_handler(
@@ -221,20 +221,20 @@ API int register_usb_storage_change_handler(
                void *data)
 {
        union action action;
-       int ret;
+       int ret_val;
 
        if (!storage_changed)
                return -EINVAL;
 
        action.storage = storage_changed;
 
-       ret = register_signal_handler(DEVICED_PATH_USBHOST,
+       ret_val = register_signal_handler(DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        SIGNAL_NAME_USB_STORAGE_CHANGED,
                                        storage_signal_handler,
                                        action,
                                        data);
-       if (ret < 0)
+       if (ret_val < 0)
                return -1;
 
        return 0;
@@ -245,19 +245,19 @@ API int register_usb_device_change_handler(
                void *data)
 {
        union action action;
-       int ret;
+       int ret_val;
 
        if (!device_changed)
                return -EINVAL;
 
        action.device = device_changed;
-       ret = register_signal_handler(DEVICED_PATH_USBHOST,
+       ret_val = register_signal_handler(DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        SIGNAL_NAME_USB_DEVICE_CHANGED,
                                        device_signal_handler,
                                        action,
                                        data);
-       if (ret < 0)
+       if (ret_val < 0)
                return -1;
 
        return 0;
@@ -306,55 +306,55 @@ API int unregister_usb_device_change_handler(
 
 API int mount_usb_storage(char *path)
 {
-       int ret, val;
+       int ret_dbus, val;
 
        if (!path)
                return -1;
 
-       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        METHOD_REQUEST_STORAGE_MOUNT,
                                        g_variant_new("(s)", path), &val);
 
-       if (ret < 0)
-               return ret;
+       if (ret_dbus < 0)
+               return ret_dbus;
        return val;
 }
 
 API int unmount_usb_storage(char *path)
 {
-       int ret, val;
+       int ret_dbus, val;
 
        if (!path)
                return -1;
 
-       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        METHOD_REQUEST_STORAGE_UNMOUNT,
                                        g_variant_new("(s)", path), &val);
 
-       if (ret < 0)
-               return ret;
+       if (ret_dbus < 0)
+               return ret_dbus;
        return val;
 }
 
 API int format_usb_storage(char *path)
 {
-       int ret, val;
+       int ret_dbus, val;
 
        if (!path)
                return -1;
 
-       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                                        DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        METHOD_REQUEST_STORAGE_FORMAT,
                                        g_variant_new("(s)", path), &val);
 
-       if (ret < 0)
-               return ret;
+       if (ret_dbus < 0)
+               return ret_dbus;
        return val;
 }
 
@@ -362,13 +362,13 @@ API int open_usb_device(char *path, int *out_fd)
 {
        GVariant *reply = NULL;
        int *fdlist = NULL;
-       int ret = 0;
+       int ret_dbus = 0;
        int size = 0;
 
        if (!out_fd || !path)
                return -EINVAL;
 
-       ret = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME,
                                                                DEVICED_PATH_USBHOST,
                                                                DEVICED_INTERFACE_USBHOST,
                                                                METHOD_OPEN_DEVICE,
@@ -378,7 +378,7 @@ API int open_usb_device(char *path, int *out_fd)
                                                                0,
                                                                &fdlist,
                                                                &size);
-       if (ret < 0) {
+       if (ret_dbus < 0) {
                _E("Unable to open USB device.");
                return -1;
        }
@@ -386,13 +386,13 @@ API int open_usb_device(char *path, int *out_fd)
                _E("Failed to get fd list.");
                return -1;
        }
-       if (!g_variant_get_safe(reply, "(i)", &ret)) {
+       if (!g_variant_get_safe(reply, "(i)", &ret_dbus)) {
                _E("Failed to get(%s): no message.", g_variant_get_type_string(reply));
-               ret = -1;
+               ret_dbus = -1;
                goto out;
        }
 
-       if (ret >= 0)
+       if (ret_dbus >= 0)
                *out_fd = fdlist[0];
 out:
        if (fdlist)
@@ -400,5 +400,5 @@ out:
        if (reply)
                g_variant_unref(reply);
 
-       return ret;
+       return ret_dbus;
 }

diff --git a/src/power-command/command.c b/src/power-command/command.c
index 443756d..6974548 100644 (file)
--- a/src/power-command/command.c
+++ b/src/power-command/command.c
@@ -285,12 +285,12 @@ struct parse_result parse_reboot_et_al(enum application application, int argc, c
 
 int call_deviced_poweroff(const char *type, const char *extra_option, const char *message)
 {
-       int result = extra_option
+       int ret_dbus = extra_option
                ? dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", g_variant_new("(ss)", type, extra_option), NULL)
                : dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), NULL)
        ;
-       if (result < 0) {
-               fprintf(stderr, "Error: %d", result);
+       if (ret_dbus < 0) {
+               fprintf(stderr, "Error: %d", ret_dbus);
                return EXIT_FAILURE;
        }
 

diff --git a/src/power/power-control.c b/src/power/power-control.c
index c5abfd1..0bce7ae 100644 (file)
--- a/src/power/power-control.c
+++ b/src/power/power-control.c
@@ -88,7 +88,7 @@ void pm_history_save(enum pm_log_type log_type, int code)
 void pm_history_print(int fd, int count)
 {
        int start_index, index, i;
-       int ret;
+       int ret_val;
        char buf[255];
        char time_buf[30];
 
@@ -113,8 +113,8 @@ void pm_history_print(int fd, int count)
                        history_string[pm_history_log[index].log_type],
                        pm_history_log[index].keycode,
                        time_buf);
-               ret = write(fd, buf, strlen(buf));
-               if (ret < 0)
+               ret_val = write(fd, buf, strlen(buf));
+               if (ret_val < 0)
                        _E("Write() failed: %d", errno);
        }
 }
@@ -199,11 +199,11 @@ int vital_state_changed(void *data)
 
 int pm_suspend(void)
 {
-       int ret;
+       int ret_val;
 
        _I("system suspend");
-       ret = sys_set_str(POWER_STATE_PATH, "mem");
-       _I("System resume: %d", ret);
+       ret_val = sys_set_str(POWER_STATE_PATH, "mem");
+       _I("System resume: %d", ret_val);
        return 0;
 }
 
@@ -230,13 +230,13 @@ int pm_get_power_lock(void)
 int pm_get_power_lock_support(void)
 {
        static int power_lock_support = -1;
-       int ret;
+       int ret_val;
 
        if (power_lock_support >= 0)
                goto out;
 
-       ret = sys_check_node(POWER_LOCK_PATH);
-       if (ret < 0)
+       ret_val = sys_check_node(POWER_LOCK_PATH);
+       if (ret_val < 0)
                power_lock_support = false;
        else
                power_lock_support = true;
@@ -267,15 +267,15 @@ int check_wakeup_src(void)
 
 int get_wakeup_count(int *cnt)
 {
-       int ret;
+       int ret_val;
        int wakeup_count;
 
        if (!cnt)
                return -EINVAL;
 
-       ret = sys_get_int(POWER_WAKEUP_PATH, &wakeup_count);
-       if (ret < 0)
-               return ret;
+       ret_val = sys_get_int(POWER_WAKEUP_PATH, &wakeup_count);
+       if (ret_val < 0)
+               return ret_val;
 
        *cnt = wakeup_count;
        return 0;
@@ -283,11 +283,11 @@ int get_wakeup_count(int *cnt)
 
 int set_wakeup_count(int cnt)
 {
-       int ret;
+       int ret_val;
 
-       ret = sys_set_int(POWER_WAKEUP_PATH, cnt);
-       if (ret < 0)
-               return ret;
+       ret_val = sys_set_int(POWER_WAKEUP_PATH, cnt);
+       if (ret_val < 0)
+               return ret_val;
 
        return 0;
 }

diff --git a/src/power/power-handler.c b/src/power/power-handler.c
index 58a8807..9c007fe 100644 (file)
--- a/src/power/power-handler.c
+++ b/src/power/power-handler.c
@@ -111,10 +111,10 @@ out:
 
 static void poweroff_start_animation(void)
 {
-       int ret;
+       int ret_val;
 
-       ret = systemd_start_unit_async("shutdown-animation.service", NULL);
-       if (ret < 0)
+       ret_val = systemd_start_unit_async("shutdown-animation.service", NULL);
+       if (ret_val < 0)
                _E("Failed to start shutdown animation.");
 
        gettimeofday(&tv_start_poweroff, NULL);
@@ -141,18 +141,18 @@ static void disable_display(void)
 
 static int disable_systemd_journald(void)
 {
-       int ret;
+       int ret_val;
 
-       ret = systemd_stop_unit_async("systemd-journald.socket", NULL);
-       if (ret < 0) {
+       ret_val = systemd_stop_unit_async("systemd-journald.socket", NULL);
+       if (ret_val < 0) {
                _E("Failed to stop 'systemd-journald.socket'.");
-               return ret;
+               return ret_val;
        }
 
-       ret = systemd_stop_unit_async("systemd-journald.service", NULL);
-       if (ret < 0) {
+       ret_val = systemd_stop_unit_async("systemd-journald.service", NULL);
+       if (ret_val < 0) {
                _E("Failed to stop 'systemd-journald.service'.");
-               return ret;
+               return ret_val;
        }
        return 0;
 }
@@ -165,14 +165,14 @@ static int disable_systemd_journald(void)
  */
 static bool disable_coredump_handler(void)
 {
-       int ret = 0;
+       int ret_val = 0;
        int fd = open("/proc/sys/kernel/core_pattern", O_WRONLY);
        if (fd >= 0) {
-               ret = write(fd, "/dev/null", sizeof("/dev/null") - 1);
+               ret_val = write(fd, "/dev/null", sizeof("/dev/null") - 1);
                close(fd);
        }
 
-       bool is_ok = ret > 0;
+       bool is_ok = ret_val > 0;
        _I("Disabling core dumps %s.", is_ok  ? "succeeded" : "failed");
 
        return is_ok;
@@ -457,7 +457,7 @@ static int poweroff_option_valid(enum poweroff_type type_e, const char *option)
 static void poweroff_send_broadcast(int status)
 {
        static int old = 0;
-       int ret;
+       int ret_dbus;
 
        if (old == status)
                return;
@@ -467,18 +467,18 @@ static void poweroff_send_broadcast(int status)
        old = status;
 
        /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangeState signal for POWEROFF_TYPE_DIRECT and POWEROFF_TYPE_RESTART */
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret_dbus = dbus_handle_emit_dbus_signal(NULL,
                                                DEVICED_PATH_POWEROFF,
                                                DEVICED_INTERFACE_POWEROFF,
                                                SIGNAL_POWEROFF_STATE,
                                                g_variant_new("(i)", status));
-       if (ret < 0)
+       if (ret_dbus < 0)
                _E("Failed to send dbus signal(%s)", SIGNAL_POWEROFF_STATE);
 }
 
 static int power_execute_pid(const char *typename, const char *option)
 {
-       int ret;
+       int ret_val;
 
        if (poweroff_stage >= POWEROFF_TRIGGERED) {
                _E("Duplicate poweroff request. Poweroff was already triggered.");
@@ -502,8 +502,8 @@ static int power_execute_pid(const char *typename, const char *option)
                return -EINVAL;
        }
 
-       ret = vconf_set_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, poweroff_opt.type);
-       if (ret < 0)
+       ret_val = vconf_set_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, poweroff_opt.type);
+       if (ret_val < 0)
                _E("Failed to set vconf value for power off status: %d", vconf_get_ext_errno());
 
        poweroff_stage = POWEROFF_TRIGGERED;
@@ -731,7 +731,7 @@ static int add_poweroff_option(enum poweroff_type type, const char *option)
 static int load_config(struct parse_result *result, void *user_data)
 {
        enum poweroff_type type;
-       int ret;
+       int ret_val;
 
        if (MATCH(result->section, "PowerOff"))
                type = POWEROFF_TYPE_DIRECT;
@@ -743,10 +743,10 @@ static int load_config(struct parse_result *result, void *user_data)
        if (!MATCH(result->name, "Option"))
                return 0;
 
-       ret = add_poweroff_option(type, result->value);
-       if (ret < 0) {
+       ret_val = add_poweroff_option(type, result->value);
+       if (ret_val < 0) {
                _E("Failed to add %s option=%s", result->section, result->value);
-               return ret;
+               return ret_val;
        }
 
        return 0;
@@ -766,12 +766,12 @@ out:
 
 static void power_init(void *data)
 {
-       int ret;
+       int ret_val;
 
        /* init dbus interface */
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface);
-       if (ret < 0)
-               _E("Failed to init dbus method: %d", ret);
+       ret_val = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface);
+       if (ret_val < 0)
+               _E("Failed to init dbus method: %d", ret_val);
 
        add_booting_done_handler(NULL);
 
@@ -781,9 +781,9 @@ static void power_init(void *data)
        add_poweroff_option(POWEROFF_TYPE_RESTART, NULL);
        add_poweroff_option(POWEROFF_TYPE_EXIT, NULL);
 
-       ret = config_parse(POWER_CONF_FILE, load_config, NULL);
-       if (ret < 0)
-               _E("Failed to load power off config: %d", ret);
+       ret_val = config_parse(POWER_CONF_FILE, load_config, NULL);
+       if (ret_val < 0)
+               _E("Failed to load power off config: %d", ret_val);
 
        poweroff_stage = POWEROFF_DEFAULT;
 }

diff --git a/src/usb/usb-state.c b/src/usb/usb-state.c
index df86bb3..284e468 100644 (file)
--- a/src/usb/usb-state.c
+++ b/src/usb/usb-state.c
@@ -273,23 +273,23 @@ out:
 
 static void add_notification_handler(void)
 {
-       int ret;
+       int ret_val;
 
        if (noti_id < 0) {
-               ret = add_async_notification("MediaDeviceNotiOn", media_noti_cb, NULL);
-               if (ret < 0)
-                       _E("Failed to add USB notification for usb connection: %d", ret);
+               ret_val = add_async_notification("MediaDeviceNotiOn", media_noti_cb, NULL);
+               if (ret_val < 0)
+                       _E("Failed to add USB notification for usb connection: %d", ret_val);
        }
 }
 
 static void remove_notification_handler(void)
 {
-       int ret;
+       int ret_val;
 
        if (noti_id >= 0) {
-               ret = remove_notification("MediaDeviceNotiOff", noti_id);
-               if (ret < 0)
-                       _E("Failed to remove USB notification for usb connection: %d", ret);
+               ret_val = remove_notification("MediaDeviceNotiOff", noti_id);
+               if (ret_val < 0)
+                       _E("Failed to remove USB notification for usb connection: %d", ret_val);
                else
                        noti_id = -1;
        }