[PATCH 2/2] storage_conf: Make virStorageAuthDefFormat return void

[Michal Privoznik <mprivozn@xxxxxxxxxx>]

This function returns nothing but zero. Therefore it makes no
sense to have it returning an integer.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 src/conf/domain_conf.c    | 18 ++++++------------
 src/conf/storage_conf.c   |  6 ++----
 src/util/virstoragefile.c |  4 +---
 src/util/virstoragefile.h |  2 +-
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b6ebe918d..92797f7c0 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22901,10 +22901,8 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
          * kept in the storage pool and would be overwritten anyway.
          * So avoid formatting it for volumes. */
         if (src->auth && src->authInherited &&
-            src->type != VIR_STORAGE_TYPE_VOLUME) {
-            if (virStorageAuthDefFormat(&childBuf, src->auth) < 0)
-                goto error;
-        }
+            src->type != VIR_STORAGE_TYPE_VOLUME)
+            virStorageAuthDefFormat(&childBuf, src->auth);
 
         /* If we found encryption as a child of <source>, then format it
          * as we found it. */
@@ -23100,10 +23098,8 @@ virDomainDiskDefFormat(virBufferPtr buf,
 
     /* Format as child of <disk> if defined there; otherwise,
      * if defined as child of <source>, then format later */
-    if (def->src->auth && !def->src->authInherited) {
-        if (virStorageAuthDefFormat(buf, def->src->auth) < 0)
-            return -1;
-    }
+    if (def->src->auth && !def->src->authInherited)
+        virStorageAuthDefFormat(buf, def->src->auth);
 
     if (virDomainDiskSourceFormat(buf, def->src, def->startupPolicy,
                                   flags, xmlopt) < 0)
@@ -23736,10 +23732,8 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
 
     if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
         scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI &&
-        iscsisrc->src->auth) {
-        if (virStorageAuthDefFormat(buf, iscsisrc->src->auth) < 0)
-            return -1;
-    }
+        iscsisrc->src->auth)
+        virStorageAuthDefFormat(buf, iscsisrc->src->auth);
 
     virBufferAdjustIndent(buf, -2);
     if (!closedSource)
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index f808cd291..b9135722c 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -953,10 +953,8 @@ virStoragePoolSourceFormat(virBufferPtr buf,
         virBufferAsprintf(buf, "<format type='%s'/>\n", format);
     }
 
-    if (src->auth) {
-        if (virStorageAuthDefFormat(buf, src->auth) < 0)
-            return -1;
-    }
+    if (src->auth)
+        virStorageAuthDefFormat(buf, src->auth);
 
     virBufferEscapeString(buf, "<vendor name='%s'/>\n", src->vendor);
     virBufferEscapeString(buf, "<product name='%s'/>\n", src->product);
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index f0b1d329c..d1972d6d1 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1891,7 +1891,7 @@ virStorageAuthDefParse(xmlDocPtr xml, xmlNodePtr root)
 }
 
 
-int
+void
 virStorageAuthDefFormat(virBufferPtr buf,
                         virStorageAuthDefPtr authdef)
 {
@@ -1908,8 +1908,6 @@ virStorageAuthDefFormat(virBufferPtr buf,
                                 &authdef->seclookupdef);
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</auth>\n");
-
-    return 0;
 }
 
 
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 9e8afa493..0095cd138 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -367,7 +367,7 @@ int virStorageFileGetSCSIKey(const char *path,
 void virStorageAuthDefFree(virStorageAuthDefPtr def);
 virStorageAuthDefPtr virStorageAuthDefCopy(const virStorageAuthDef *src);
 virStorageAuthDefPtr virStorageAuthDefParse(xmlDocPtr xml, xmlNodePtr root);
-int virStorageAuthDefFormat(virBufferPtr buf, virStorageAuthDefPtr authdef);
+void virStorageAuthDefFormat(virBufferPtr buf, virStorageAuthDefPtr authdef);
 
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
-- 
2.16.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list