From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 24 Feb 2021 09:41:00 +0000 (+0100)
Subject: virDomainDefSetMetadata: Avoid temporary variable for string copy
X-Git-Tag: v7.2.0-rc1~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b356a3ce7c42134cf63f543ce7899ed5638d4809;p=thirdparty%2Flibvirt.git

virDomainDefSetMetadata: Avoid temporary variable for string copy

Since error checking was removed when switching to g_strdup, it doesn't
make much sense to have 'tmp' around.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2504911931..f342c4b46b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30425,7 +30425,6 @@ virDomainDefSetMetadata(virDomainDefPtr def,
     xmlDocPtr doc = NULL;
     xmlNodePtr old;
     xmlNodePtr new = NULL;
-    char *tmp = NULL;
     int ret = -1;
 
     if (type >= VIR_DOMAIN_METADATA_LAST) {
@@ -30436,19 +30435,17 @@ virDomainDefSetMetadata(virDomainDefPtr def,
 
     switch ((virDomainMetadataType) type) {
     case VIR_DOMAIN_METADATA_DESCRIPTION:
-        if (STRNEQ_NULLABLE(metadata, ""))
-            tmp = g_strdup(metadata);
+        g_clear_pointer(&def->description, g_free);
 
-        VIR_FREE(def->description);
-        def->description = tmp;
+        if (STRNEQ_NULLABLE(metadata, ""))
+            def->description = g_strdup(metadata);
         break;
 
     case VIR_DOMAIN_METADATA_TITLE:
-        if (STRNEQ_NULLABLE(metadata, ""))
-            tmp = g_strdup(metadata);
+        g_clear_pointer(&def->title, g_free);
 
-        VIR_FREE(def->title);
-        def->title = tmp;
+        if (STRNEQ_NULLABLE(metadata, ""))
+            def->title = g_strdup(metadata);
         break;
 
     case VIR_DOMAIN_METADATA_ELEMENT: