From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 12 Jun 2014 14:11:43 +0000 (+0200)
Subject: util: storagefile: Introduce helper to free storage source perms
X-Git-Tag: v1.2.6-rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aadf437502e209e45ed8aa2b4c915ae574a7265;p=thirdparty%2Flibvirt.git

util: storagefile: Introduce helper to free storage source perms

It will also be reused later.
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 09b5d10e1e..a23ac6a48f 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1451,6 +1451,17 @@ virStorageNetHostDefFree(size_t nhosts,
 }
 
 
+static void
+virStoragePermsFree(virStoragePermsPtr def)
+{
+    if (!def)
+        return;
+
+    VIR_FREE(def->label);
+    VIR_FREE(def);
+}
+
+
 virStorageNetHostDefPtr
 virStorageNetHostDefCopy(size_t nhosts,
                          virStorageNetHostDefPtr hosts)
@@ -1564,10 +1575,7 @@ virStorageSourceClear(virStorageSourcePtr def)
             virSecurityDeviceLabelDefFree(def->seclabels[i]);
         VIR_FREE(def->seclabels);
     }
-    if (def->perms) {
-        VIR_FREE(def->perms->label);
-        VIR_FREE(def->perms);
-    }
+    virStoragePermsFree(def->perms);
     VIR_FREE(def->timestamps);
 
     virStorageNetHostDefFree(def->nhosts, def->hosts);