|
 |
546e1e |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
546e1e |
From: "Eduardo Lima (Etrunko)" <etrunko@redhat.com>
|
|
|
546e1e |
Date: Thu, 13 Jul 2017 16:56:34 -0300
|
|
|
546e1e |
Subject: [PATCH] Introduce ovirt_resource_new*() functions
|
|
|
546e1e |
|
|
|
546e1e |
These functions should be used to replace usage of g_initable_new()
|
|
|
546e1e |
around the codebase, as it avoids code duplication by combining all
|
|
|
546e1e |
different ways of creating a resource in a single function.
|
|
|
546e1e |
|
|
|
546e1e |
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
|
546e1e |
---
|
|
|
546e1e |
govirt/ovirt-resource-private.h | 4 +++
|
|
|
546e1e |
govirt/ovirt-resource.c | 47 +++++++++++++++++++++++++++++++++
|
|
|
546e1e |
2 files changed, 51 insertions(+)
|
|
|
546e1e |
|
|
|
546e1e |
diff --git a/govirt/ovirt-resource-private.h b/govirt/ovirt-resource-private.h
|
|
|
546e1e |
index ff4e705..ef47557 100644
|
|
|
546e1e |
--- a/govirt/ovirt-resource-private.h
|
|
|
546e1e |
+++ b/govirt/ovirt-resource-private.h
|
|
|
546e1e |
@@ -27,6 +27,10 @@
|
|
|
546e1e |
|
|
|
546e1e |
G_BEGIN_DECLS
|
|
|
546e1e |
|
|
|
546e1e |
+OvirtResource *ovirt_resource_new(GType type);
|
|
|
546e1e |
+OvirtResource *ovirt_resource_new_from_id(GType type, const char *id, const char *href);
|
|
|
546e1e |
+OvirtResource *ovirt_resource_new_from_xml(GType type, RestXmlNode *node, GError **error);
|
|
|
546e1e |
+
|
|
|
546e1e |
const char *ovirt_resource_get_action(OvirtResource *resource,
|
|
|
546e1e |
const char *action);
|
|
|
546e1e |
char *ovirt_resource_to_xml(OvirtResource *resource);
|
|
|
546e1e |
diff --git a/govirt/ovirt-resource.c b/govirt/ovirt-resource.c
|
|
|
546e1e |
index 7f79ab7..1413a77 100644
|
|
|
546e1e |
--- a/govirt/ovirt-resource.c
|
|
|
546e1e |
+++ b/govirt/ovirt-resource.c
|
|
|
546e1e |
@@ -1065,3 +1065,50 @@ gboolean ovirt_resource_delete_finish(OvirtResource *resource,
|
|
|
546e1e |
|
|
|
546e1e |
return ovirt_rest_call_finish(result, err);
|
|
|
546e1e |
}
|
|
|
546e1e |
+
|
|
|
546e1e |
+
|
|
|
546e1e |
+static OvirtResource *ovirt_resource_new_valist(GType type, GError **error, const char *prop_name, ...)
|
|
|
546e1e |
+{
|
|
|
546e1e |
+ gpointer resource;
|
|
|
546e1e |
+ va_list var_args;
|
|
|
546e1e |
+ GError *local_error = NULL;
|
|
|
546e1e |
+
|
|
|
546e1e |
+ g_return_val_if_fail(g_type_is_a(type, OVIRT_TYPE_RESOURCE), NULL);
|
|
|
546e1e |
+
|
|
|
546e1e |
+ va_start(var_args, prop_name);
|
|
|
546e1e |
+ resource = g_initable_new_valist(type, prop_name, var_args, NULL, &local_error);
|
|
|
546e1e |
+ va_end(var_args);
|
|
|
546e1e |
+
|
|
|
546e1e |
+ if (local_error != NULL) {
|
|
|
546e1e |
+ g_warning("Failed to create resource of type %s: %s", g_type_name(type), local_error->message);
|
|
|
546e1e |
+ g_propagate_error(error, local_error);
|
|
|
546e1e |
+ }
|
|
|
546e1e |
+
|
|
|
546e1e |
+ return OVIRT_RESOURCE(resource);
|
|
|
546e1e |
+}
|
|
|
546e1e |
+
|
|
|
546e1e |
+
|
|
|
546e1e |
+G_GNUC_INTERNAL
|
|
|
546e1e |
+OvirtResource *ovirt_resource_new(GType type)
|
|
|
546e1e |
+{
|
|
|
546e1e |
+ return ovirt_resource_new_valist(type, NULL, NULL);
|
|
|
546e1e |
+}
|
|
|
546e1e |
+
|
|
|
546e1e |
+
|
|
|
546e1e |
+G_GNUC_INTERNAL
|
|
|
546e1e |
+OvirtResource *ovirt_resource_new_from_id(GType type, const char *id, const char *href)
|
|
|
546e1e |
+{
|
|
|
546e1e |
+ g_return_val_if_fail(id != NULL, NULL);
|
|
|
546e1e |
+ g_return_val_if_fail(href != NULL, NULL);
|
|
|
546e1e |
+
|
|
|
546e1e |
+ return ovirt_resource_new_valist(type, NULL, "guid", id, "href", href, NULL);
|
|
|
546e1e |
+}
|
|
|
546e1e |
+
|
|
|
546e1e |
+
|
|
|
546e1e |
+G_GNUC_INTERNAL
|
|
|
546e1e |
+OvirtResource *ovirt_resource_new_from_xml(GType type, RestXmlNode *node, GError **error)
|
|
|
546e1e |
+{
|
|
|
546e1e |
+ g_return_val_if_fail(node != NULL, NULL);
|
|
|
546e1e |
+
|
|
|
546e1e |
+ return ovirt_resource_new_valist(type, error, "xml-node", node, NULL);
|
|
|
546e1e |
+}
|