|
 |
2aba60 |
From 1bff3d3ca4101639e659c8649731020e7a5c9c10 Mon Sep 17 00:00:00 2001
|
|
|
2aba60 |
From: "Eduardo Lima (Etrunko)" <etrunko@redhat.com>
|
|
|
2aba60 |
Date: Tue, 3 Oct 2017 17:32:03 -0300
|
|
|
2aba60 |
Subject: [PATCH] utils: Factor out basic value type setting from
|
|
|
2aba60 |
_set_property_value_from_type()
|
|
|
2aba60 |
|
|
|
2aba60 |
A simple cosmetic enhancement with the hope to improve code readability.
|
|
|
2aba60 |
|
|
|
2aba60 |
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
|
2aba60 |
---
|
|
|
2aba60 |
govirt/ovirt-utils.c | 59 ++++++++++++++++++++++++++++++----------------------
|
|
|
2aba60 |
1 file changed, 34 insertions(+), 25 deletions(-)
|
|
|
2aba60 |
|
|
|
2aba60 |
diff --git a/govirt/ovirt-utils.c b/govirt/ovirt-utils.c
|
|
|
2aba60 |
index a60c754..a0146fd 100644
|
|
|
2aba60 |
--- a/govirt/ovirt-utils.c
|
|
|
2aba60 |
+++ b/govirt/ovirt-utils.c
|
|
|
2aba60 |
@@ -134,6 +134,39 @@ ovirt_rest_xml_node_get_str_array_from_path(RestXmlNode *node, const char *path,
|
|
|
2aba60 |
return (GStrv) g_array_free(array, FALSE);
|
|
|
2aba60 |
}
|
|
|
2aba60 |
|
|
|
2aba60 |
+static gboolean
|
|
|
2aba60 |
+_set_property_value_from_basic_type(GValue *value,
|
|
|
2aba60 |
+ GType type,
|
|
|
2aba60 |
+ const char *value_str)
|
|
|
2aba60 |
+{
|
|
|
2aba60 |
+ switch(type) {
|
|
|
2aba60 |
+ case G_TYPE_BOOLEAN: {
|
|
|
2aba60 |
+ gboolean bool_value = ovirt_utils_boolean_from_string(value_str);
|
|
|
2aba60 |
+ g_value_set_boolean(value, bool_value);
|
|
|
2aba60 |
+ return TRUE;
|
|
|
2aba60 |
+ }
|
|
|
2aba60 |
+ case G_TYPE_STRING: {
|
|
|
2aba60 |
+ g_value_set_string(value, value_str);
|
|
|
2aba60 |
+ return TRUE;
|
|
|
2aba60 |
+ }
|
|
|
2aba60 |
+ case G_TYPE_UINT: {
|
|
|
2aba60 |
+ guint uint_value = strtoul(value_str, NULL, 0);
|
|
|
2aba60 |
+ g_value_set_uint(value, uint_value);
|
|
|
2aba60 |
+ return TRUE;
|
|
|
2aba60 |
+ }
|
|
|
2aba60 |
+ case G_TYPE_UINT64: {
|
|
|
2aba60 |
+ guint64 int64_value = g_ascii_strtoull(value_str, NULL, 0);
|
|
|
2aba60 |
+ g_value_set_uint64(value, int64_value);
|
|
|
2aba60 |
+ return TRUE;
|
|
|
2aba60 |
+ }
|
|
|
2aba60 |
+ default: {
|
|
|
2aba60 |
+ g_warning("Unexpected type '%s' with value '%s'", g_type_name(type), value_str);
|
|
|
2aba60 |
+ }
|
|
|
2aba60 |
+ }
|
|
|
2aba60 |
+
|
|
|
2aba60 |
+ return FALSE;
|
|
|
2aba60 |
+}
|
|
|
2aba60 |
+
|
|
|
2aba60 |
static gboolean
|
|
|
2aba60 |
_set_property_value_from_type(GValue *value,
|
|
|
2aba60 |
GType type,
|
|
|
2aba60 |
@@ -174,31 +207,7 @@ _set_property_value_from_type(GValue *value,
|
|
|
2aba60 |
goto end;
|
|
|
2aba60 |
}
|
|
|
2aba60 |
|
|
|
2aba60 |
- switch(type) {
|
|
|
2aba60 |
- case G_TYPE_BOOLEAN: {
|
|
|
2aba60 |
- gboolean bool_value = ovirt_utils_boolean_from_string(value_str);
|
|
|
2aba60 |
- g_value_set_boolean(value, bool_value);
|
|
|
2aba60 |
- break;
|
|
|
2aba60 |
- }
|
|
|
2aba60 |
- case G_TYPE_STRING: {
|
|
|
2aba60 |
- g_value_set_string(value, value_str);
|
|
|
2aba60 |
- break;
|
|
|
2aba60 |
- }
|
|
|
2aba60 |
- case G_TYPE_UINT: {
|
|
|
2aba60 |
- guint uint_value = strtoul(value_str, NULL, 0);
|
|
|
2aba60 |
- g_value_set_uint(value, uint_value);
|
|
|
2aba60 |
- break;
|
|
|
2aba60 |
- }
|
|
|
2aba60 |
- case G_TYPE_UINT64: {
|
|
|
2aba60 |
- guint64 int64_value = g_ascii_strtoull(value_str, NULL, 0);
|
|
|
2aba60 |
- g_value_set_uint64(value, int64_value);
|
|
|
2aba60 |
- break;
|
|
|
2aba60 |
- }
|
|
|
2aba60 |
- default: {
|
|
|
2aba60 |
- g_warning("Unexpected type '%s' with value '%s'", g_type_name(type), value_str);
|
|
|
2aba60 |
- ret = FALSE;
|
|
|
2aba60 |
- }
|
|
|
2aba60 |
- }
|
|
|
2aba60 |
+ ret = _set_property_value_from_basic_type(value, type, value_str);
|
|
|
2aba60 |
|
|
|
2aba60 |
end:
|
|
|
2aba60 |
return ret;
|
|
|
2aba60 |
--
|
|
|
2aba60 |
2.14.4
|
|
|
2aba60 |
|