Change function name

ex) dh_get_param_from_var to g_variant_get_safe

Change-Id: Ie8f2efe288b983debe60ec29100a4e146e280827
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>

diff --git a/plugins/mobile/battery/battery-notification.c b/plugins/mobile/battery/battery-notification.c
index 11cd6d7..6b9c4b4 100644 (file)
--- a/plugins/mobile/battery/battery-notification.c
+++ b/plugins/mobile/battery/battery-notification.c
@@ -92,7 +92,7 @@ static void low_noti_cb(GVariant *var, void *user_data, GError *err)
                return;
        }
 
-       if (!dh_get_param_from_var(var, "(i)", &noti_low)) {
+       if (!g_variant_get_safe(var, "(i)", &noti_low)) {
                _E("Failed to notify low: no message(%s)", g_variant_get_type_string(var));
                goto out;
        }
@@ -110,7 +110,7 @@ static void critical_noti_cb(GVariant *var, void *user_data, GError *err)
        if (!var)
                return;
 
-       if (!dh_get_param_from_var(var, "(i)", &id)) {
+       if (!g_variant_get_safe(var, "(i)", &id)) {
                _E("Failed to notify critical: no message(%s)", g_variant_get_type_string(var));
                goto out;
        }

diff --git a/plugins/wearable/display/display-handler.c b/plugins/wearable/display/display-handler.c
index 1c2f778..27b97a8 100644 (file)
--- a/plugins/wearable/display/display-handler.c
+++ b/plugins/wearable/display/display-handler.c
@@ -122,7 +122,7 @@ static void aod_change_signal(GDBusConnection  *conn,
 {
        char *screen = NULL;
 
-       if (!dh_get_param_from_var(param, "(s)", &screen)) {
+       if (!g_variant_get_safe(param, "(s)", &screen)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(s)", g_variant_get_type_string(param));
                goto out;
        }

diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c
index 0361d62..2b093dc 100644 (file)
--- a/plugins/wearable/display/swim.c
+++ b/plugins/wearable/display/swim.c
@@ -78,7 +78,7 @@ static void swimmode_signal_handler(GDBusConnection  *conn,
        pid_t pid;
        bool lcd_state = false;
 
-       if (!dh_get_param_from_var(param, "(i)", &val)) {
+       if (!g_variant_get_safe(param, "(i)", &val)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(i)", g_variant_get_type_string(param));
                return;
        }

diff --git a/src/apps/apps.c b/src/apps/apps.c
index 744e3af..a192797 100644 (file)
--- a/src/apps/apps.c
+++ b/src/apps/apps.c
@@ -50,7 +50,7 @@ static void __cb(GVariant *var, void *user_data, GError *err)
                return;
        }
 
-       if (!dh_get_param_from_var(var, "(i)", &ret)) {
+       if (!g_variant_get_safe(var, "(i)", &ret)) {
                _E("No message: %s", g_variant_get_type_string(var));
                goto out;
        }

diff --git a/src/auto-test/battery.c b/src/auto-test/battery.c
index 4ebf33e..93a69c4 100644 (file)
--- a/src/auto-test/battery.c
+++ b/src/auto-test/battery.c
@@ -236,7 +236,7 @@ static bool get_battery_method(const char *method, int *value)
        }
 
        if (!strncmp(method, METHOD_BATTERY_HEALTH, strlen(METHOD_BATTERY_HEALTH))) {
-               if (!dh_get_param_from_var(msg, "(s)", &health)) {
+               if (!g_variant_get_safe(msg, "(s)", &health)) {
                        _E("Failed to call dbus method(%s): No message.", METHOD_BATTERY_HEALTH);
                } else {
                        _I("Success. %s=%s", METHOD_BATTERY_HEALTH, health);
@@ -245,7 +245,7 @@ static bool get_battery_method(const char *method, int *value)
        }
        else
        {
-               if (!dh_get_param_from_var(msg, "(i)", &val)) {
+               if (!g_variant_get_safe(msg, "(i)", &val)) {
                        _E("Failed to call dbus method(%s): No message.", method);
                } else {
                        _I("Success. %s=%d", method, val);
@@ -277,7 +277,7 @@ static bool get_battery_method_vconf(const char *method)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("Failed to call dbus method(%s): No message.", method);
        else {
                if (val == -EIO) {
@@ -324,7 +324,7 @@ static bool set_battery_low_level(int newlevel)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("Failed to call dbus method(%s): No message", METHOD_BATTERY_SETLOWBATLEVEL);
                goto out;
        } else {
@@ -410,7 +410,7 @@ static bool get_battery_info()
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(isssiiiiiiii)", &val[0],  //return value
+       if (!g_variant_get_safe(msg, "(isssiiiiiiii)", &val[0],  //return value
                                                        &argv[0],//status
                                                        &argv[1],//health
                                                        &argv[2],//power source
@@ -709,7 +709,7 @@ static bool set_battery_power_supply(int index)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("Failed to call dbus method(%s): No message", POWER_SUBSYSTEM);
                val = -EBADMSG;
        } else {
@@ -742,7 +742,7 @@ static bool get_battery_power_supply(int rsp[], char **power_source)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(iiiiiiiisiiiii)", &val,  //return value
+       if (!g_variant_get_safe(msg, "(iiiiiiiisiiiii)", &val,  //return value
                                                        &rsp[0],        //capacity
                                                        &rsp[1],        //charge_status
                                                        &rsp[2],        //health

diff --git a/src/auto-test/brightness.c b/src/auto-test/brightness.c
index 97d9912..424adb6 100644 (file)
--- a/src/auto-test/brightness.c
+++ b/src/auto-test/brightness.c
@@ -72,7 +72,7 @@ static void check_result(int expect_default, int expect_current)
                return;
        }
 
-       if (!dh_get_param_from_var(msg, "(ii)", &result_default, &result_current)) {
+       if (!g_variant_get_safe(msg, "(ii)", &result_default, &result_current)) {
                _D("Return type mismatching from GetBrightnessInfo.");
                return;
        }

diff --git a/src/auto-test/display.c b/src/auto-test/display.c
index c2494f5..0b92d84 100644 (file)
--- a/src/auto-test/display.c
+++ b/src/auto-test/display.c
@@ -68,7 +68,7 @@ static bool get_display_method(const char *method, GVariant *param, int *value)
                _E("fail (%s): no reply", method);
                return ret;
        }
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                _I("success (%s): %d", method, val);
@@ -96,7 +96,7 @@ static bool set_display_method(const char *method, GVariant *param)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {
@@ -167,7 +167,7 @@ static bool set_display_autobrightness_min(int min)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("fail : no message");
        } else {
                if ((min < 1) || (min > 100)) {

diff --git a/src/auto-test/extcon.c b/src/auto-test/extcon.c
index ed2c187..645eda6 100644 (file)
--- a/src/auto-test/extcon.c
+++ b/src/auto-test/extcon.c
@@ -40,7 +40,7 @@ static bool request_extcon_method(const char *method, GVariant *param)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {
@@ -73,7 +73,7 @@ static bool get_sysnoti_method(const char *method)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {
@@ -107,7 +107,7 @@ static bool get_extcon_status(char *device_name)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail : no message");
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {

diff --git a/src/auto-test/ir.c b/src/auto-test/ir.c
index de548b9..48ad1c0 100644 (file)
--- a/src/auto-test/ir.c
+++ b/src/auto-test/ir.c
@@ -52,7 +52,7 @@ static bool request_ir_method(const char *method, const char *sig, int *param)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {
@@ -106,7 +106,7 @@ static bool set_ir_command(char *command)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail : no message");
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {

diff --git a/src/auto-test/led.c b/src/auto-test/led.c
old mode 100644 (file)
new mode 100755 (executable)
index 7e4356d..9d3ffe8
--- a/src/auto-test/led.c
+++ b/src/auto-test/led.c
@@ -52,7 +52,7 @@ static bool get_led_method(const char *method)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                _I("success (%s): %d", method, val);
@@ -78,7 +78,7 @@ static bool set_led_method(const char *method, GVariant *param)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {

diff --git a/src/auto-test/power.c b/src/auto-test/power.c
index 96a6a85..2a88a98 100644 (file)
--- a/src/auto-test/power.c
+++ b/src/auto-test/power.c
@@ -40,7 +40,7 @@ static bool set_reboot_method(const char *method, GVariant *param)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {
@@ -86,7 +86,7 @@ static bool request_lowpower_method(const char *method, GVariant *param)
                        return ret;
                }
 
-               if (!dh_get_param_from_var(msg, "(i)", &val))
+               if (!g_variant_get_safe(msg, "(i)", &val))
                        _E("fail (%s): no message", method);
                else {
                        if (val == -EAGAIN) {

diff --git a/src/auto-test/proc.c b/src/auto-test/proc.c
index 44bb8dc..914d922 100644 (file)
--- a/src/auto-test/proc.c
+++ b/src/auto-test/proc.c
@@ -35,7 +35,7 @@ static bool get_sysnoti_revision()
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail : no message");
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {

diff --git a/src/auto-test/test.c b/src/auto-test/test.c
index 794bb74..6039944 100644 (file)
--- a/src/auto-test/test.c
+++ b/src/auto-test/test.c
@@ -92,7 +92,7 @@ void __cb(void *data, GVariant *result, GError *err)
         return;
      }
 
-       if (!dh_get_param_from_var(result, "(i)", &temp)) {
+       if (!g_variant_get_safe(result, "(i)", &temp)) {
                _E("Failed to get variant(%s): no call back message", g_variant_get_type_string(result));
                goto out;
        }

diff --git a/src/auto-test/time.c b/src/auto-test/time.c
old mode 100644 (file)
new mode 100755 (executable)
index 036b919..5b9daae
--- a/src/auto-test/time.c
+++ b/src/auto-test/time.c
@@ -36,7 +36,7 @@ static bool request_sysnoti_method(const char *method, GVariant *param)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail (%s): no message", method);
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {

diff --git a/src/auto-test/udev.c b/src/auto-test/udev.c
index 25e3c8e..cc48c43 100644 (file)
--- a/src/auto-test/udev.c
+++ b/src/auto-test/udev.c
@@ -42,7 +42,7 @@ static int udev(int index)
                return -EBADMSG;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val))
+       if (!g_variant_get_safe(msg, "(i)", &val))
                _E("fail : no message");
        else {
                if ((val == -ENOTSUP) || (val == -ENOSYS)) {

diff --git a/src/battery-monitor/battery-monitor.c b/src/battery-monitor/battery-monitor.c
index 50e719a..f6168dc 100644 (file)
--- a/src/battery-monitor/battery-monitor.c
+++ b/src/battery-monitor/battery-monitor.c
@@ -439,7 +439,7 @@ static void _dbus_cb_AppStatusChange(GDBusConnection  *conn,
        char *status = NULL;
 
        /* (issss) : pid, appid, pkgid, status, type */
-       if (!dh_get_param_from_var(param, "(issss)", &pid, &appid, NULL, &status, NULL)) {
+       if (!g_variant_get_safe(param, "(issss)", &pid, &appid, NULL, &status, NULL)) {
                _E("Failed to get params from gvariant. expected:%s, type:%s", "(issss)", g_variant_get_type_string(param));
                goto out;
        }

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index 06b2ed7..34722aa 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -184,7 +184,7 @@ static void full_noti_cb(GVariant *var, void *user_data, GError *err)
        if (!var)
                return;
 
-       if (!dh_get_param_from_var(var, "(i)", &id)) {
+       if (!g_variant_get_safe(var, "(i)", &id)) {
                _E("Failed to notify full: no message(%s)", g_variant_get_type_string(var));
                goto out;
        }
@@ -200,7 +200,7 @@ static void noti_off_cb(GVariant *var, void *user_data, GError *err)
 {
        int ret = 0;
 
-       if (!dh_get_param_from_var(var, "(i)", &ret)) {
+       if (!g_variant_get_safe(var, "(i)", &ret)) {
                _E("Failed to off notification: no message(%s)", g_variant_get_type_string(var));
                goto out;
        }
@@ -267,7 +267,7 @@ static void charge_noti_on(GVariant *var, void *user_data, GError *err)
        if (!var)
                return;
 
-       if (!dh_get_param_from_var(var, "(i)", &id)) {
+       if (!g_variant_get_safe(var, "(i)", &id)) {
                _E("Failed to notify charge: no message(%s)", g_variant_get_type_string(var));
                goto out;
        }

diff --git a/src/devicectl/devicectl.c b/src/devicectl/devicectl.c
index 1b4b0c4..8358377 100644 (file)
--- a/src/devicectl/devicectl.c
+++ b/src/devicectl/devicectl.c
@@ -128,7 +128,7 @@ static int dump_mode(char **args)
                goto out;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret)) {
+       if (!g_variant_get_safe(msg, "(i)", &ret)) {
                printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                ret = -EBADMSG;
        }
@@ -163,7 +163,7 @@ static int display_state(char **args)
                goto out;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret)) {
+       if (!g_variant_get_safe(msg, "(i)", &ret)) {
                printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                ret = -EBADMSG;
        }
@@ -242,7 +242,7 @@ static int save_dbus_name(char **args)
                return -EBADMSG;
        }
 
-       if (!dh_get_param_from_var(msg, "(as)", &iter)) {
+       if (!g_variant_get_safe(msg, "(as)", &iter)) {
                printf("Invalid list name arguments.");
                g_variant_unref(msg);
                return -EINVAL;
@@ -316,7 +316,7 @@ static int enable_device(char **args)
                goto out;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret)) {
+       if (!g_variant_get_safe(msg, "(i)", &ret)) {
                printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                ret = -EBADMSG;
        }
@@ -349,7 +349,7 @@ static int disable_device(char **args)
                goto out;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret)) {
+       if (!g_variant_get_safe(msg, "(i)", &ret)) {
                printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                ret = -EBADMSG;
        }
@@ -382,7 +382,7 @@ static int power_operation(char **args, char *type)
                goto out;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret)) {
+       if (!g_variant_get_safe(msg, "(i)", &ret)) {
                printf("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                ret = -EBADMSG;
        }

diff --git a/src/display/ambient-mode.c b/src/display/ambient-mode.c
index a0bb2bc..0e5e478 100644 (file)
--- a/src/display/ambient-mode.c
+++ b/src/display/ambient-mode.c
@@ -209,7 +209,7 @@ static void homescreen_signal_handler(GDBusConnection  *conn,
        char *screen = NULL;
        pid_t pid;
 
-       if (!dh_get_param_from_var(param, "(s)", &screen)) {
+       if (!g_variant_get_safe(param, "(s)", &screen)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(s)", g_variant_get_type_string(param));
                goto out;
        }

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index 7dbb69a..e56c7f3 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -1240,7 +1240,7 @@ static void changestate_signal_handler(GDBusConnection  *conn,
        char *state = NULL;
        pid_t pid;
 
-       if (!dh_get_param_from_var(param, "(issss)", &val, NULL, NULL, &state, NULL)) {
+       if (!g_variant_get_safe(param, "(issss)", &val, NULL, NULL, &state, NULL)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(issss)", g_variant_get_type_string(param));
                goto out;
        }

diff --git a/src/display/display-lock.c b/src/display/display-lock.c
index b1e08d4..b0d2568 100644 (file)
--- a/src/display/display-lock.c
+++ b/src/display/display-lock.c
@@ -77,7 +77,7 @@ static void default_pmlock_check_cb(GVariant *var, void *user_data, GError *err)
        if (!var)
                return;
 
-       if (!dh_get_param_from_var(var, "(iis)", &pid, &detected, &app_id)) {
+       if (!g_variant_get_safe(var, "(iis)", &pid, &detected, &app_id)) {
                _E("Failed to get params from gvariant. expected:%s, type:%s", "(iis)", g_variant_get_type_string(var));
                goto out;
        }

diff --git a/src/dump/dump.c b/src/dump/dump.c
index da2d4fb..dc39db1 100644 (file)
--- a/src/dump/dump.c
+++ b/src/dump/dump.c
@@ -98,7 +98,7 @@ static void dump_signal_handler(GDBusConnection  *conn,
        int mode = 0;
        char *log_path = NULL;
 
-       if (!dh_get_param_from_var(param, "(is)", &mode, &log_path)) {
+       if (!g_variant_get_safe(param, "(is)", &mode, &log_path)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(is)", g_variant_get_type_string(param));
                goto out;
        }

diff --git a/src/libdeviced/deviced-noti.c b/src/libdeviced/deviced-noti.c
index fa371ee..7fbbd7e 100644 (file)
--- a/src/libdeviced/deviced-noti.c
+++ b/src/libdeviced/deviced-noti.c
@@ -67,7 +67,7 @@ static int dbus_proc_handler(char* type, char *buf)
        if (!msg)
                return -EBADMSG;
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                val = -EBADMSG;
                goto out;
@@ -121,7 +121,7 @@ static int dbus_power_handler(char* type)
        if (!msg)
                return -EBADMSG;
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                val = -EBADMSG;
                goto out;
@@ -165,7 +165,7 @@ static int dbus_time_handler(char* type, char* buf)
        if (!msg)
                return -EBADMSG;
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                val = -EBADMSG;
                goto out;
@@ -202,7 +202,7 @@ static int alarm_set_time(time_t timet)
                return -EBADMSG;
        }
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("Failed to get type(%s): no message", g_variant_get_type_string(msg));
                val = -EBADMSG;
        }
@@ -243,7 +243,7 @@ static int dbus_cpu_handler(char* type, char* buf_pid, char* buf_freq)
        if (!msg)
                return -EBADMSG;
 
-       if (!dh_get_param_from_var(msg, "(i)", &val)) {
+       if (!g_variant_get_safe(msg, "(i)", &val)) {
                _E("Failed to get signature(%s): no message", g_variant_get_type_string(msg));
                val = -EBADMSG;
                goto out;

diff --git a/src/libdeviced/display.c b/src/libdeviced/display.c
index 5985d82..3247822 100644 (file)
--- a/src/libdeviced/display.c
+++ b/src/libdeviced/display.c
@@ -116,7 +116,7 @@ static void display_change_cb(GVariant *var, void *user_data, GError *err)
        if (!var)
                return;
 
-       if (!dh_get_param_from_var(var, "(i)", &val)) {
+       if (!g_variant_get_safe(var, "(i)", &val)) {
                _E("Failed to get(%s): no message", g_variant_get_type_string(var));
                g_variant_unref(var);
                return;
@@ -159,7 +159,7 @@ static void display_lock_cb(GVariant *var, void *user_data, GError *err)
        if (!var)
                return;
 
-       if (!dh_get_param_from_var(var, "(i)", &val)) {
+       if (!g_variant_get_safe(var, "(i)", &val)) {
                _E("Failed to get(%s): no message", g_variant_get_type_string(var));
                goto out;
        }
@@ -217,7 +217,7 @@ static void display_unlock_cb(GVariant *var, void *user_data, GError *err)
        if (!var)
                return;
 
-       if (!dh_get_param_from_var(var, "(i)", &val)) {
+       if (!g_variant_get_safe(var, "(i)", &val)) {
                _E("Failed to get(%s): no message", g_variant_get_type_string(var));
                goto out;
        }

diff --git a/src/libdeviced/led.c b/src/libdeviced/led.c
index 85537b2..af43c64 100644 (file)
--- a/src/libdeviced/led.c
+++ b/src/libdeviced/led.c
@@ -43,7 +43,7 @@ API int led_get_brightness(void)
        if (!msg)
                return -EBADMSG;
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret_val)) {
+       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;
        }
@@ -66,7 +66,7 @@ API int led_get_max_brightness(void)
        if (!msg)
                return -EBADMSG;
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret_val)) {
+       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;
        }
@@ -89,7 +89,7 @@ API int led_set_brightness_with_noti(int val, bool enable)
        if (!msg)
                return -EBADMSG;
 
-       if (!dh_get_param_from_var(msg, "(i)", &ret_val)) {
+       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;
        }

diff --git a/src/libdeviced/usbhost.c b/src/libdeviced/usbhost.c
index 808ef1b..a813c1f 100644 (file)
--- a/src/libdeviced/usbhost.c
+++ b/src/libdeviced/usbhost.c
@@ -95,7 +95,7 @@ static void storage_signal_handler(GDBusConnection  *conn,
        dd_list *elem;
        struct signal_handler *handler;
 
-       if (!dh_get_param_from_var(param, "(ssi)", &type, &syspath, &mount)) {
+       if (!g_variant_get_safe(param, "(ssi)", &type, &syspath, &mount)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(ssi)", g_variant_get_type_string(param));
                goto out;
        }
@@ -135,7 +135,7 @@ static void device_signal_handler(GDBusConnection  *conn,
        dd_list *element;
 
        memset(&device, 0, sizeof(device));
-       if (!dh_get_param_from_var(param, "(isiiiiisss)", &state,
+       if (!g_variant_get_safe(param, "(isiiiiisss)", &state,
                                                &syspath,
                                                &device.baseclass,
                                                &device.subclass,
@@ -362,7 +362,7 @@ API int open_usb_device(char *path, int *out_fd)
                _E("Failed to get fd list.");
                return -1;
        }
-       if (!dh_get_param_from_var(reply, "(i)", &ret)) {
+       if (!g_variant_get_safe(reply, "(i)", &ret)) {
                _E("Failed to get(%s): no message.", g_variant_get_type_string(reply));
                ret = -1;
                goto out;

diff --git a/src/usb-host-test/usb-host-test.c b/src/usb-host-test/usb-host-test.c
index 0f2ac13..cf10da9 100644 (file)
--- a/src/usb-host-test/usb-host-test.c
+++ b/src/usb-host-test/usb-host-test.c
@@ -268,7 +268,7 @@ static void service_started_handler(GDBusConnection  *conn,
        char *unit = NULL;
        int ret;
 
-       if (!dh_get_param_from_var(param, "(uoss)", &id, NULL, &unit, NULL)) {
+       if (!g_variant_get_safe(param, "(uoss)", &id, NULL, &unit, NULL)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(uoss)", g_variant_get_type_string(param));
                return ;
        }
@@ -310,7 +310,7 @@ static void service_stopped_handler(GDBusConnection  *conn,
        usbg_state *s;
        usbg_gadget *g;
 
-       if (!dh_get_param_from_var(param, "(uoss)", &id, NULL, &unit, NULL)) {
+       if (!g_variant_get_safe(param, "(uoss)", &id, NULL, &unit, NULL)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(uoss)", g_variant_get_type_string(param));
                return ;
        }

diff --git a/src/usb/usb-dbus.c b/src/usb/usb-dbus.c
index 5bc9a87..db428aa 100644 (file)
--- a/src/usb/usb-dbus.c
+++ b/src/usb/usb-dbus.c
@@ -91,7 +91,7 @@ static void change_usb_client_mode(GDBusConnection  *conn,
        unsigned int mode;
        int req_vconf = -1;
 
-       if (!dh_get_param_from_var(param, "(i)", &req_vconf)) {
+       if (!g_variant_get_safe(param, "(i)", &req_vconf)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(i)", g_variant_get_type_string(param));
                return;
        }

diff --git a/src/usb/usb-state.c b/src/usb/usb-state.c
index 5e232a3..a88b5df 100644 (file)
--- a/src/usb/usb-state.c
+++ b/src/usb/usb-state.c
@@ -259,7 +259,7 @@ static void media_noti_cb(GVariant *var, void *user_data, GError *err)
                return;
        }
 
-       if (!dh_get_param_from_var(var, "(i)", &id)) {
+       if (!g_variant_get_safe(var, "(i)", &id)) {
                _E("Failed to get variant(%s): no USB notification message", g_variant_get_type_string(var));
                goto out;
        }

diff --git a/src/usbhost/usb-host.c b/src/usbhost/usb-host.c
index 0c02247..91a5cf1 100644 (file)
--- a/src/usbhost/usb-host.c
+++ b/src/usbhost/usb-host.c
@@ -902,7 +902,7 @@ static void popup_result_signal_handler(GDBusConnection  *conn,
                return;
        }
 
-       if (!dh_get_param_from_var(param, "(ii)", &allow, &always)) {
+       if (!g_variant_get_safe(param, "(ii)", &allow, &always)) {
                _E("failed to get params from gvariant. expected:%s, type:%s", "(ii)", g_variant_get_type_string(param));
                free(req);
                return;