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