From: Ján Tomko <jtomko@redhat.com>
Date: Sat, 19 Oct 2019 16:41:29 +0000 (+0200)
Subject: conf: use g_strdup in virDomainDiskSet
X-Git-Tag: v5.9.0-rc1~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d74067c07be3cdd655a87ceaafdb3005396f7676;p=thirdparty%2Flibvirt.git

conf: use g_strdup in virDomainDiskSet

Use a temporary variable to allow copying from the
currently set source.

Always return 0 since none of the callers distinguishes
between 0 and 1 propagated from VIR_STRDUP.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 88e93f6fb8..cd9b6ca993 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2139,15 +2139,10 @@ virDomainDiskGetSource(virDomainDiskDef const *def)
 int
 virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src)
 {
-    int ret;
-    char *tmp = def->src->path;
-
-    ret = VIR_STRDUP(def->src->path, src);
-    if (ret < 0)
-        def->src->path = tmp;
-    else
-        VIR_FREE(tmp);
-    return ret;
+    char *tmp = g_strdup(src);
+    g_free(def->src->path);
+    def->src->path = tmp;
+    return 0;
 }
 
 
@@ -2174,15 +2169,10 @@ virDomainDiskGetDriver(const virDomainDiskDef *def)
 int
 virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name)
 {
-    int ret;
-    char *tmp = def->driverName;
-
-    ret = VIR_STRDUP(def->driverName, name);
-    if (ret < 0)
-        def->driverName = tmp;
-    else
-        VIR_FREE(tmp);
-    return ret;
+    char *tmp = g_strdup(name);
+    g_free(def->driverName);
+    def->driverName = tmp;
+    return 0;
 }