From 418f781547381d50e2225fe9ad2bf39bf2a1d2a3 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Thu, 10 Sep 2020 14:30:14 +0900 Subject: [PATCH] Change function name ex) dh_get_param_from_var to g_variant_get_safe Change-Id: I85c9946996885fde44443c09c491c829903bc378 Signed-off-by: lokilee73 --- src/libgdbus/dbus-system.c | 4 ++-- src/libgdbus/dbus-system.h | 2 +- src/libgdbus/dbus-systemd.c | 12 ++++++------ src/libsystemd/systemd-state.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libgdbus/dbus-system.c b/src/libgdbus/dbus-system.c index 93b42db..ca1bd5d 100644 --- a/src/libgdbus/dbus-system.c +++ b/src/libgdbus/dbus-system.c @@ -2924,12 +2924,12 @@ int check_systemd_active(void) if (!msg) return -EBADMSG; - if (!dh_get_param_from_var(msg, "(v)", &var)) { + if (!g_variant_get_safe(msg, "(v)", &var)) { _E("reply is not variant type"); ret = -EBADMSG; goto out; } - if (!dh_get_param_from_var(var, "(s)", &state)) { + if (!g_variant_get_safe(var, "(s)", &state)) { _E("variant doesn't have string (%s)", g_variant_get_type_string(var)); ret = -EBADMSG; goto out; diff --git a/src/libgdbus/dbus-system.h b/src/libgdbus/dbus-system.h index faf5e02..cbcc9be 100644 --- a/src/libgdbus/dbus-system.h +++ b/src/libgdbus/dbus-system.h @@ -66,7 +66,7 @@ typedef struct { gchar *sec_label; } GDBusCredentials; -#define dh_get_param_from_var(gvar, signature, ...) ((g_strcmp0(signature, g_variant_get_type_string(gvar)) == 0) ? g_variant_get(gvar, signature, __VA_ARGS__), TRUE : FALSE) +#define g_variant_get_safe(gvar, signature, ...) ((g_strcmp0(signature, g_variant_get_type_string(gvar)) == 0) ? g_variant_get(gvar, signature, __VA_ARGS__), TRUE : FALSE) #define dbus_handle_new_g_variant_tuple() g_variant_new_tuple(NULL, 0) diff --git a/src/libgdbus/dbus-systemd.c b/src/libgdbus/dbus-systemd.c index 6da7748..9667115 100644 --- a/src/libgdbus/dbus-systemd.c +++ b/src/libgdbus/dbus-systemd.c @@ -78,7 +78,7 @@ static void _cb_JobRemoved(GDBusConnection *conn, _E("User_data uinfo is null"); return ; } - if (!dh_get_param_from_var(param, "(uoss)", NULL, &job_id, &unit_name, NULL)) { + if (!g_variant_get_safe(param, "(uoss)", NULL, &job_id, &unit_name, NULL)) { _E("Failed to get param"); return ; } @@ -137,7 +137,7 @@ static int _systemd_control_unit_wait(const char *method, SYSTEMD_DBUS_MANAGER_IFACE, method, g_variant_new("(ss)", name, "replace")); - if (!reply || !dh_get_param_from_var(reply, "(o)", &objpath)) { + if (!reply || !g_variant_get_safe(reply, "(o)", &objpath)) { _E("fail (%s): no message", method); ret = -EBADMSG; goto finish; @@ -188,7 +188,7 @@ static int _systemd_control_unit_async(const char *method, const char *name) method, g_variant_new("(ss)", name, "replace")); - if (!reply || !dh_get_param_from_var(reply, "(o)", &objpath)) { + if (!reply || !g_variant_get_safe(reply, "(o)", &objpath)) { _E("fail (%s): no message", method); ret = -EBADMSG; goto finish; @@ -413,7 +413,7 @@ GVariant *systemd_get_manager_property(const char *property) DBUS_IFACE_DBUS_PROPERTIES, "Get", g_variant_new("(ss)", SYSTEMD_DBUS_MANAGER_IFACE, property)); - if (!reply || !dh_get_param_from_var(reply, "(v)", &val)) + if (!reply || !g_variant_get_safe(reply, "(v)", &val)) _E("Failed to get variant"); if (reply) g_variant_unref(reply); @@ -438,7 +438,7 @@ GVariant *systemd_get_unit_property(const char *unit, const char *property) "Get", g_variant_new("(ss)", SYSTEMD_DBUS_UNIT_IFACE, property)); - if (!reply || !dh_get_param_from_var(reply, "(v)", &val)) + if (!reply || !g_variant_get_safe(reply, "(v)", &val)) _E("Failed to get variant"); if (reply) g_variant_unref(reply); @@ -463,7 +463,7 @@ GVariant *systemd_get_service_property(const char *unit, const char *property) DBUS_IFACE_DBUS_PROPERTIES, "Get", g_variant_new("(ss)", SYSTEMD_DBUS_SERVICE_IFACE, property)); - if (!reply || !dh_get_param_from_var(reply, "(v)", &val)) + if (!reply || !g_variant_get_safe(reply, "(v)", &val)) _E("Failed to get variant"); if (reply) g_variant_unref(reply); diff --git a/src/libsystemd/systemd-state.c b/src/libsystemd/systemd-state.c index ffaeff8..1c25575 100644 --- a/src/libsystemd/systemd-state.c +++ b/src/libsystemd/systemd-state.c @@ -38,7 +38,7 @@ int check_system_boot_finished(void) _E("Failed to get system state: No reply"); goto err; } - if (!dh_get_param_from_var(reply, "s", &state)) { + if (!g_variant_get_safe(reply, "s", &state)) { _E("Failed to get system state(%s)", g_variant_get_type_string(reply)); goto err; } -- 2.7.4