src: Drop NULL check before calling virBufferEscapeString()

There's no need to check if any of the three arguments passed to
virBufferEscapeString() is NULL as the function does so itself.
Well, in a few places we're comparing the last argument against
NULL. Drop the comparison then.

Generated using the following spatch:

  @@
  expression X, Y, E;
  @@
  - if (E) virBufferEscapeString(X, Y, E);
  + virBufferEscapeString(X, Y, E);

  @@
  expression X, Y, E;
  @@
  - if (E) {
    virBufferEscapeString(X, Y, E);
  - }

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 03a05366e12d85e1da29e069e77836ea15827f35..b1a73afef228e6647288774f61c93bf80694f43a 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -24215,11 +24215,8 @@ virDomainDiskDefFormatIotune(virBuffer *buf,
         virBufferAsprintf(&childBuf, "<size_iops_sec>%llu</size_iops_sec>\n",
                           disk->blkdeviotune.size_iops_sec);
     }
-
-    if (disk->blkdeviotune.group_name) {
-        virBufferEscapeString(&childBuf, "<group_name>%s</group_name>\n",
-                              disk->blkdeviotune.group_name);
-    }
+    virBufferEscapeString(&childBuf, "<group_name>%s</group_name>\n",
+                          disk->blkdeviotune.group_name);
 
     FORMAT_IOTUNE(total_bytes_sec_max_length);
     FORMAT_IOTUNE(read_bytes_sec_max_length);
@@ -27491,9 +27488,7 @@ virDomainGraphicsAuthDefFormatAttr(virBuffer *buf,
     if (!def->passwd)
         return;
 
-    if (def->username)
-        virBufferEscapeString(buf, " username='%s'",
-                              def->username);
+    virBufferEscapeString(buf, " username='%s'", def->username);
 
     if (flags & VIR_DOMAIN_DEF_FORMAT_SECURE)
         virBufferEscapeString(buf, " passwd='%s'",
@@ -27623,8 +27618,7 @@ virDomainGraphicsListenDefFormatAddr(virBuffer *buf,
                  VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))
         return;
 
-    if (glisten->address)
-        virBufferEscapeString(buf, " listen='%s'", glisten->address);
+    virBufferEscapeString(buf, " listen='%s'", glisten->address);
 }
 
 static void
@@ -27637,8 +27631,7 @@ virDomainGraphicsDefFormatGL(virBuffer *buf,
     if (gl != VIR_TRISTATE_BOOL_ABSENT)
         virBufferAsprintf(&attrBuf, " enable='%s'", virTristateBoolTypeToString(gl));
 
-    if (rendernode)
-        virBufferEscapeString(&attrBuf, " rendernode='%s'", rendernode);
+    virBufferEscapeString(&attrBuf, " rendernode='%s'", rendernode);
 
     virXMLFormatElement(buf, "gl", &attrBuf, NULL);
 }

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index fe44fd28c328ecf7f02acc8247bb2abfb1b9ebac..26887342e4cf8ce911f1d10dae1aa0b040701b71 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2000,10 +2000,8 @@ virNetworkDNSDefFormat(virBuffer *buf,
     for (i = 0; i < def->nfwds; i++) {
 
         virBufferAddLit(buf, "<forwarder");
-        if (def->forwarders[i].domain) {
-            virBufferEscapeString(buf, " domain='%s'",
-                                  def->forwarders[i].domain);
-        }
+        virBufferEscapeString(buf, " domain='%s'",
+                              def->forwarders[i].domain);
         if (VIR_SOCKET_ADDR_VALID(&def->forwarders[i].addr)) {
             g_autofree char *addr = virSocketAddrFormat(&def->forwarders[i].addr);
             int port = virSocketAddrGetPort(&def->forwarders[i].addr);
@@ -2093,11 +2091,8 @@ virNetworkIPDefFormat(virBuffer *buf,
 
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);
-
-    if (def->tftproot) {
-        virBufferEscapeString(buf, "<tftp root='%s'/>\n",
-                              def->tftproot);
-    }
+    virBufferEscapeString(buf, "<tftp root='%s'/>\n",
+                          def->tftproot);
     if ((def->nranges || def->nhosts)) {
         size_t i;
         virBufferAddLit(buf, "<dhcp>\n");

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index ed0d340aa2ed9d3af490011ae628341f3ba000dc..09f9e218a4a19421c08ac2556c8b5bbedc0107ce 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -432,9 +432,7 @@ virNodeDeviceCapUSBDevDefFormat(virBuffer *buf,
     virBufferAsprintf(buf, "<bus>%d</bus>\n", data->usb_dev.bus);
     virBufferAsprintf(buf, "<device>%d</device>\n",
                       data->usb_dev.device);
-    if (data->usb_dev.port)
-        virBufferEscapeString(buf, "<port>%s</port>\n",
-                              data->usb_dev.port);
+    virBufferEscapeString(buf, "<port>%s</port>\n", data->usb_dev.port);
     virBufferAsprintf(buf, "<product id='0x%04x'",
                       data->usb_dev.product);
     if (data->usb_dev.product_name)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index ccbfc8bac777c782ba819be535022466a64bd8a2..6fdca4be099510cad542b35addff4e4659b6f8f5 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2335,18 +2335,18 @@ qemuDomainDiskPrivateFormat(virDomainDiskDef *disk,
     if (priv->nodeCopyOnRead || disk->nthrottlefilters > 0) {
         virBufferAddLit(buf, "<nodenames>\n");
         virBufferAdjustIndent(buf, 2);
-        if (priv->nodeCopyOnRead)
-            virBufferEscapeString(buf, "<nodename type='copyOnRead' name='%s'/>\n",
-                                  priv->nodeCopyOnRead);
+        virBufferEscapeString(buf,
+                              "<nodename type='copyOnRead' name='%s'/>\n",
+                              priv->nodeCopyOnRead);
         if (disk->nthrottlefilters > 0) {
             for (i = 0; i < disk->nthrottlefilters; i++) {
 
-                if (disk->throttlefilters[i]->nodename)
-                    virBufferEscapeString(buf, "<nodename type='throttle-filter' name='%s' ",
-                                          disk->throttlefilters[i]->nodename);
+                virBufferEscapeString(buf,
+                                      "<nodename type='throttle-filter' name='%s' ",
+                                      disk->throttlefilters[i]->nodename);
 
-                if (disk->throttlefilters[i]->group_name)
-                    virBufferEscapeString(buf, "group='%s'/>\n", disk->throttlefilters[i]->group_name);
+                virBufferEscapeString(buf, "group='%s'/>\n",
+                                      disk->throttlefilters[i]->group_name);
             }
         }
         virBufferAdjustIndent(buf, -2);