From: John Ferlan <jferlan@redhat.com>
Date: Fri, 8 Feb 2019 13:29:41 +0000 (-0500)
Subject: util: Rename variable in virStorageSourceNewFromBackingRelative
X-Git-Tag: v5.1.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2cdee57d2c5cc34595d1ce85c425e996baa9c9c;p=thirdparty%2Flibvirt.git

util: Rename variable in virStorageSourceNewFromBackingRelative

To prepare for subsequent change to use VIR_AUTOPTR logic rename
the @ret to @def.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 8c39840f64..63b95cd760 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2590,14 +2590,14 @@ static virStorageSourcePtr
 virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent,
                                        const char *rel)
 {
-    virStorageSourcePtr ret;
+    virStorageSourcePtr def;
     VIR_AUTOFREE(char *) dirname = NULL;
 
-    if (VIR_ALLOC(ret) < 0)
+    if (VIR_ALLOC(def) < 0)
         return NULL;
 
     /* store relative name */
-    if (VIR_STRDUP(ret->relPath, parent->backingStoreRaw) < 0)
+    if (VIR_STRDUP(def->relPath, parent->backingStoreRaw) < 0)
         goto error;
 
     if (!(dirname = mdir_name(parent->path))) {
@@ -2606,39 +2606,39 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent,
     }
 
     if (STRNEQ(dirname, "/")) {
-        if (virAsprintf(&ret->path, "%s/%s", dirname, rel) < 0)
+        if (virAsprintf(&def->path, "%s/%s", dirname, rel) < 0)
             goto error;
     } else {
-        if (virAsprintf(&ret->path, "/%s", rel) < 0)
+        if (virAsprintf(&def->path, "/%s", rel) < 0)
             goto error;
     }
 
     if (virStorageSourceGetActualType(parent) == VIR_STORAGE_TYPE_NETWORK) {
-        ret->type = VIR_STORAGE_TYPE_NETWORK;
+        def->type = VIR_STORAGE_TYPE_NETWORK;
 
         /* copy the host network part */
-        ret->protocol = parent->protocol;
+        def->protocol = parent->protocol;
         if (parent->nhosts) {
-            if (!(ret->hosts = virStorageNetHostDefCopy(parent->nhosts,
+            if (!(def->hosts = virStorageNetHostDefCopy(parent->nhosts,
                                                         parent->hosts)))
                 goto error;
 
-            ret->nhosts = parent->nhosts;
+            def->nhosts = parent->nhosts;
         }
 
-        if (VIR_STRDUP(ret->volume, parent->volume) < 0)
+        if (VIR_STRDUP(def->volume, parent->volume) < 0)
             goto error;
     } else {
         /* set the type to _FILE, the caller shall update it to the actual type */
-        ret->type = VIR_STORAGE_TYPE_FILE;
+        def->type = VIR_STORAGE_TYPE_FILE;
     }
 
  cleanup:
-    return ret;
+    return def;
 
  error:
-    virStorageSourceFree(ret);
-    ret = NULL;
+    virStorageSourceFree(def);
+    def = NULL;
     goto cleanup;
 }