Change function name

ex) dh_get_param_from_var to g_variant_get_safe

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

diff --git a/apps/extended-sd/src/es-internal-storage-page.c b/apps/extended-sd/src/es-internal-storage-page.c
index 3d4e26c..6b34394 100644 (file)
--- a/apps/extended-sd/src/es-internal-storage-page.c
+++ b/apps/extended-sd/src/es-internal-storage-page.c
@@ -149,7 +149,7 @@ check_speed_done(GVariant *result, void *data, GError *err)
        ret_if(ad == NULL);
        ret_if(result == NULL);
 
-       if (!dh_get_param_from_var(result, "(i)", &ret)) {
+       if (!g_variant_get_safe(result, "(i)", &ret)) {
                _E("Failed to get params from gvariant. expected:%s, type:%s", "(i)", g_variant_get_type_string(result));
                g_variant_unref(result);
                return;

diff --git a/apps/extended-sd/src/es-portable-storage-page.c b/apps/extended-sd/src/es-portable-storage-page.c
index 52cdda6..0413702 100644 (file)
--- a/apps/extended-sd/src/es-portable-storage-page.c
+++ b/apps/extended-sd/src/es-portable-storage-page.c
@@ -58,7 +58,7 @@ format_done(GVariant *result, void *data, GError *err)
        ret_if(ad == NULL);
        ret_if(result == NULL);
 
-       if (!dh_get_param_from_var(result, "(i)", &ret)) {
+       if (!g_variant_get_safe(result, "(i)", &ret)) {
                DMSG("Failed to get params from gvariant. expected:%s, type:%s", "(i)", g_variant_get_type_string(result));
                goto out;
        }
@@ -122,7 +122,7 @@ mapper_device_cb(int mapper_id, storage_dev_e dev, storage_state_e state,
                        DMSG("Failed to get storage information.");
                        return;
                }
-               if (!dh_get_param_from_var(output, "(a(issssssisibii))", &iter)) {
+               if (!g_variant_get_safe(output, "(a(issssssisibii))", &iter)) {
                        DMSG("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibii))", g_variant_get_type_string(output));
                        g_variant_unref(output);
                        return;
@@ -172,7 +172,7 @@ unmount_done(GVariant *result, void *data, GError *err)
        ret_if(ad == NULL);
        ret_if(result == NULL);
 
-       if (!dh_get_param_from_var(result, "(i)", &ret)) {
+       if (!g_variant_get_safe(result, "(i)", &ret)) {
                _E("Failed to get params from gvariant. expected:%s, type:%s", "(i)", g_variant_get_type_string(result));
                goto out;
        }

diff --git a/apps/extended-sd/src/extended-sd-main.c b/apps/extended-sd/src/extended-sd-main.c
index dc7709f..0ba2d0d 100644 (file)
--- a/apps/extended-sd/src/extended-sd-main.c
+++ b/apps/extended-sd/src/extended-sd-main.c
@@ -154,7 +154,7 @@ app_control(app_control_h app_control, void *data)
                DMSG("Failed to get storage information.");
                return;
        }
-       if (!dh_get_param_from_var(output, "(issssssisibii)", NULL, &devpath, NULL, NULL,
+       if (!g_variant_get_safe(output, "(issssssisibii)", NULL, &devpath, NULL, NULL,
                        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &id)) {
                DMSG("Failed to get params from gvariant. expected:%s, type:%s", "(issssssisibii)", g_variant_get_type_string(output));
                g_variant_unref(output);

diff --git a/src/auto-test/block.c b/src/auto-test/block.c
index 553d9be..2d05608 100644 (file)
--- a/src/auto-test/block.c
+++ b/src/auto-test/block.c
@@ -50,7 +50,7 @@ static bool request_block_method(const char *method, GVariant *param, int timeou
                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 == -ENOTSUP) || (val == -ENOSYS)) {
@@ -87,7 +87,7 @@ static int get_id()
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(issssssisibii)",
+       if (!g_variant_get_safe(msg, "(issssssisibii)",
                        NULL, NULL, NULL, NULL, NULL, NULL,
                        NULL, NULL, NULL, NULL, NULL, NULL, &val))
                _E("Failed to call %s: no message", METHOD_BLOCK_GETMMCPRIMARY);
@@ -141,7 +141,7 @@ static bool block_getdevicelist(char *type)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(a(issssssisibii))", &iter)) {
+       if (!g_variant_get_safe(msg, "(a(issssssisibii))", &iter)) {
                _E("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibii))", g_variant_get_type_string(msg));
                g_variant_unref(msg);
                return ret;
@@ -181,7 +181,7 @@ static bool block_getdevicelist2(char *type)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(a(issssssisibi))", &iter)) {
+       if (!g_variant_get_safe(msg, "(a(issssssisibi))", &iter)) {
                _E("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibi))", g_variant_get_type_string(msg));
                g_variant_unref(msg);
                return ret;
@@ -244,7 +244,7 @@ static bool block_getdeviceinfo(int id)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(issssssisibii)",
+       if (!g_variant_get_safe(msg, "(issssssisibii)",
                        NULL, NULL, NULL, NULL, NULL, NULL,
                        NULL, NULL, NULL, NULL, NULL, NULL, &val))
                _E("Failed to call %s: no message", METHOD_BLOCK_GETMMCPRIMARY);
@@ -280,7 +280,7 @@ static bool block_getmmcprimary()
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(issssssisibii)",
+       if (!g_variant_get_safe(msg, "(issssssisibii)",
                        NULL, NULL, NULL, NULL, NULL, NULL,
                        NULL, NULL, NULL, NULL, NULL, NULL, &val))
                _E("Failed to call %s: no message", METHOD_BLOCK_GETMMCPRIMARY);

diff --git a/src/auto-test/storage.c b/src/auto-test/storage.c
index cbc7852..8873c24 100644 (file)
--- a/src/auto-test/storage.c
+++ b/src/auto-test/storage.c
@@ -36,7 +36,7 @@ static bool request_storage_method(const char *method, GVariant *param)
                return ret;
        }
 
-       if (!dh_get_param_from_var(msg, "(tt)", &val1, &val2))
+       if (!g_variant_get_safe(msg, "(tt)", &val1, &val2))
                _E("Failed to call method(%s): no message", method);
        else {
                if (val1 <= 0) {

diff --git a/src/shared/apps.c b/src/shared/apps.c
index 8360dd4..2e25a52 100644 (file)
--- a/src/shared/apps.c
+++ b/src/shared/apps.c
@@ -43,7 +43,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/storage/storage.c b/src/storage/storage.c
index ead6194..cc83755 100644 (file)
--- a/src/storage/storage.c
+++ b/src/storage/storage.c
@@ -199,7 +199,7 @@ static void _popup_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;
        }
@@ -241,7 +241,7 @@ static void _noti_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;
        }