From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 11 Aug 2021 12:05:42 +0000 (+0200)
Subject: util: xml: clean up unnecessary ret variables
X-Git-Tag: v7.7.0-rc1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69e810945e8bf970923b77f60c1d0a8699a2d48d;p=thirdparty%2Flibvirt.git

util: xml: clean up unnecessary ret variables

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 82915dd064..61e3d91640 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -74,7 +74,6 @@ virXPathString(const char *xpath,
                xmlXPathContextPtr ctxt)
 {
     g_autoptr(xmlXPathObject) obj = NULL;
-    char *ret;
 
     if ((ctxt == NULL) || (xpath == NULL)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -86,8 +85,7 @@ virXPathString(const char *xpath,
         (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
         return NULL;
     }
-    ret = g_strdup((char *)obj->stringval);
-    return ret;
+    return g_strdup((char *)obj->stringval);
 }
 
 
@@ -888,7 +886,6 @@ virXPathBoolean(const char *xpath,
                 xmlXPathContextPtr ctxt)
 {
     g_autoptr(xmlXPathObject) obj = NULL;
-    int ret;
 
     if ((ctxt == NULL) || (xpath == NULL)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -900,9 +897,7 @@ virXPathBoolean(const char *xpath,
         (obj->boolval < 0) || (obj->boolval > 1)) {
         return -1;
     }
-    ret = obj->boolval;
-
-    return ret;
+    return obj->boolval;
 }
 
 /**
@@ -920,7 +915,6 @@ virXPathNode(const char *xpath,
              xmlXPathContextPtr ctxt)
 {
     g_autoptr(xmlXPathObject) obj = NULL;
-    xmlNodePtr ret;
 
     if ((ctxt == NULL) || (xpath == NULL)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -934,8 +928,7 @@ virXPathNode(const char *xpath,
         return NULL;
     }
 
-    ret = obj->nodesetval->nodeTab[0];
-    return ret;
+    return obj->nodesetval->nodeTab[0];
 }
 
 /**