[libvirt PATCH 4/4] conf: storage: remove redundant condition
We exit early if poolOptions->formatToString is false.
Fixes: 9dadc7302920f9fca0057c655d03c2b0206b9a70
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/storage_conf.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 3e584ad9b9..68842004b7 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -364,6 +364,7 @@ virStoragePoolOptionsFormatPool(virBuffer *buf,
int type)
{
virStoragePoolOptions *poolOptions;
+ size_t i;
if (!(poolOptions = virStoragePoolOptionsForPoolType(type)))
return -1;
@@ -374,22 +375,17 @@ virStoragePoolOptionsFormatPool(virBuffer *buf,
virBufferAddLit(buf, "<poolOptions>\n");
virBufferAdjustIndent(buf, 2);
- if (poolOptions->formatToString) {
- size_t i;
+ virBufferAsprintf(buf, "<defaultFormat type='%s'/>\n",
+ (poolOptions->formatToString)(poolOptions->defaultFormat));
- virBufferAsprintf(buf, "<defaultFormat type='%s'/>\n",
-
(poolOptions->formatToString)(poolOptions->defaultFormat));
+ virBufferAddLit(buf, "<enum name='sourceFormatType'>\n");
+ virBufferAdjustIndent(buf, 2);
- virBufferAddLit(buf, "<enum
name='sourceFormatType'>\n");
- virBufferAdjustIndent(buf, 2);
+ for (i = 0; i < poolOptions->lastFormat; i++)
+ virBufferAsprintf(buf, "<value>%s</value>\n",
(poolOptions->formatToString)(i));
- for (i = 0; i < poolOptions->lastFormat; i++)
- virBufferAsprintf(buf, "<value>%s</value>\n",
- (poolOptions->formatToString)(i));
-
- virBufferAdjustIndent(buf, -2);
- virBufferAddLit(buf, "</enum>\n");
- }
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</enum>\n");
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</poolOptions>\n");
--
2.39.2