From: John Ferlan <jferlan@redhat.com>
Date: Fri, 24 Jun 2016 14:25:15 +0000 (-0400)
Subject: conf: No need to check for usage fields during Format
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3977c386f608e5d533f5797132af104cedcc3f9d;p=libvirt.git

conf: No need to check for usage fields during Format

Since the virSecretDefParseUsage ensures each of the fields is present,
no need to check during virSecretDefFormatUsage (also virBufferEscapeString
is a no-op with a NULL argument).

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index de9e6cf3b9..d510645496 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -286,23 +286,15 @@ virSecretDefFormatUsage(virBufferPtr buf,
         break;
 
     case VIR_SECRET_USAGE_TYPE_VOLUME:
-        if (def->usage.volume != NULL)
-            virBufferEscapeString(buf, "<volume>%s</volume>\n",
-                                  def->usage.volume);
+        virBufferEscapeString(buf, "<volume>%s</volume>\n", def->usage.volume);
         break;
 
     case VIR_SECRET_USAGE_TYPE_CEPH:
-        if (def->usage.ceph != NULL) {
-            virBufferEscapeString(buf, "<name>%s</name>\n",
-                                  def->usage.ceph);
-        }
+        virBufferEscapeString(buf, "<name>%s</name>\n", def->usage.ceph);
         break;
 
     case VIR_SECRET_USAGE_TYPE_ISCSI:
-        if (def->usage.target != NULL) {
-            virBufferEscapeString(buf, "<target>%s</target>\n",
-                                  def->usage.target);
-        }
+        virBufferEscapeString(buf, "<target>%s</target>\n", def->usage.target);
         break;
 
     default: