]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: No need to check for usage fields during Format
authorJohn Ferlan <jferlan@redhat.com>
Fri, 24 Jun 2016 14:25:15 +0000 (10:25 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Fri, 1 Jul 2016 19:38:56 +0000 (15:38 -0400)
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>
src/conf/secret_conf.c

index de9e6cf3b9364b6696e832a3b25b2add01aba38d..d510645496b9e0e272f6c5d3fdf04958745fb000 100644 (file)
@@ -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: