[PATCH 08/34] conf: Avoid temporary variable in virDomainDiskBackingStoreFormat

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Modify the check that the format is in range to be standalone and use
the convertor function directly.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/conf/domain_conf.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b78481c280..ae17992b83 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23924,7 +23924,6 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
                                 virDomainXMLOptionPtr xmlopt,
                                 unsigned int flags)
 {
-    const char *format;
     bool inactive = flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE;

     if (!backingStore)
@@ -23939,8 +23938,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
         return 0;
     }

-    if (backingStore->format <= 0 ||
-        !(format = virStorageFileFormatTypeToString(backingStore->format))) {
+    if (backingStore->format <= 0 || backingStore->format >= VIR_STORAGE_FILE_LAST) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected disk backing store format %d"),
                        backingStore->format);
@@ -23954,7 +23952,8 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);

-    virBufferAsprintf(buf, "<format type='%s'/>\n", format);
+    virBufferAsprintf(buf, "<format type='%s'/>\n",
+                      virStorageFileFormatTypeToString(backingStore->format));
     /* We currently don't output seclabels for backing chain element */
     if (virDomainDiskSourceFormat(buf, backingStore, 0, flags, false,
                                   false, xmlopt) < 0 ||
-- 
2.20.1

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