From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Thu, 20 Sep 2018 13:28:47 +0000 (+0200)
Subject: xen_common: Change xenConfigCopyStringInternal to use virConfGetValueString
X-Git-Tag: v4.8.0-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db343ca83022757921eda472a094f45a69600b9e;p=thirdparty%2Flibvirt.git

xen_common: Change xenConfigCopyStringInternal to use virConfGetValueString

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 36a9d27c80..a35e1aff58 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -145,23 +145,13 @@ xenConfigCopyStringInternal(virConfPtr conf,
                             char **value,
                             int allowMissing)
 {
-    virConfValuePtr val;
+    int rc;
 
     *value = NULL;
-    if (!(val = virConfGetValue(conf, name))) {
-        if (allowMissing)
-            return 0;
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("config value %s was missing"), name);
+    if ((rc = virConfGetValueString(conf, name, value)) < 0)
         return -1;
-    }
 
-    if (val->type != VIR_CONF_STRING) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("config value %s was not a string"), name);
-        return -1;
-    }
-    if (!val->str) {
+    if (rc == 0) {
         if (allowMissing)
             return 0;
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -169,7 +159,7 @@ xenConfigCopyStringInternal(virConfPtr conf,
         return -1;
     }
 
-    return VIR_STRDUP(*value, val->str);
+    return 1;
 }