lib: Use NULLSTR family of macros more

There is a family of convenient macros: NULLSTR, NULLSTR_EMPTY,
NULLSTR_STAR, NULLSTR_MINUS which hides ternary operator.

Generated using the following spatch (and its obvious variants):

  @@
  expression s;
  @@
    <+...
  - s ? s : "<null>"
  + NULLSTR(s)
    ...+>

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/libvirt.c b/src/libvirt.c
index 26c3fe454fd68f77e8b9b5fc5d0761cfc59d3f22..1d37696d6f1325c9a4c76e1784204735085898fd 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -168,7 +168,7 @@ virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
         }
 
         if (cred[i].type != VIR_CRED_EXTERNAL) {
-            cred[i].result = bufptr ? bufptr : g_strdup(cred[i].defresult ? cred[i].defresult : "");
+            cred[i].result = bufptr ? bufptr : g_strdup(NULLSTR_EMPTY(cred[i].defresult));
             cred[i].resultlen = strlen(cred[i].result);
         }
     }

diff --git a/src/network/network_iptables.c b/src/network/network_iptables.c
index f774176b3d05fa2956fef82dfacc61cee3a83f34..e8da15426e8d095d8c3f72cfc964948336b7f924 100644 (file)
--- a/src/network/network_iptables.c
+++ b/src/network/network_iptables.c
@@ -867,10 +867,10 @@ iptablesForwardMasquerade(virFirewall *fw,
     if (addrStartStr && addrStartStr[0]) {
         if (addrEndStr && addrEndStr[0]) {
             natRangeStr = g_strdup_printf("%s-%s%s", addrStartStr, addrEndStr,
-                                          portRangeStr ? portRangeStr : "");
+                                          NULLSTR_EMPTY(portRangeStr));
         } else {
             natRangeStr = g_strdup_printf("%s%s", addrStartStr,
-                                          portRangeStr ? portRangeStr : "");
+                                          NULLSTR_EMPTY(portRangeStr));
         }
 
         virFirewallCmdAddArgList(fw, fwCmd,

diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c
index 268d1f12caa742dd519ec9b5c3e09a398ce6ab43..f8b5ab665d3c43e00443d5dbc40fc944ea965c24 100644 (file)
--- a/src/network/network_nftables.c
+++ b/src/network/network_nftables.c
@@ -588,10 +588,10 @@ nftablesAddForwardMasquerade(virFirewall *fw,
     if (addrStartStr && addrStartStr[0]) {
         if (addrEndStr && addrEndStr[0]) {
             natRangeStr = g_strdup_printf("%s-%s%s", addrStartStr, addrEndStr,
-                                          portRangeStr ? portRangeStr : "");
+                                          NULLSTR_EMPTY(portRangeStr));
         } else {
             natRangeStr = g_strdup_printf("%s%s", addrStartStr,
-                                          portRangeStr ? portRangeStr : "");
+                                          NULLSTR_EMPTY(portRangeStr));
         }
 
         virFirewallCmdAddArgList(fw, fwCmd, "counter", "snat", "to", natRangeStr, NULL);

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index 08ca99e1ac57ac216ca754e04064413463f07b83..914f8596bd28154dcf6fdbe773e9825768c83ddd 100644 (file)
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1090,7 +1090,7 @@ qemuFirmwareEnsureNVRAM(virDomainDef *def,
 
     loader->nvram->path = g_strdup_printf("%s/%s_VARS%s",
                                           cfg->nvramDir, def->name,
-                                          ext ? ext : "");
+                                          NULLSTR_EMPTY(ext));
 }
 
 

diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index 3b02fe0cece0ee54943e8ee72e3896714162e731..f365c1999c3d358a6a7b56ebda9f318c25fe96fd 100644 (file)
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -188,8 +188,8 @@ virNetDevIPAddrAdd(const char *ifname,
 
     VIR_DEBUG("Adding IP address %s/%d%s%s%s%s to %s",
               NULLSTR(ipStr), prefix,
-              peerStr ? " peer " : "", peerStr ? peerStr : "",
-              bcastStr ? " bcast " : "", bcastStr ? bcastStr : "",
+              peerStr ? " peer " : "", NULLSTR_EMPTY(peerStr),
+              bcastStr ? " bcast " : "", NULLSTR_EMPTY(bcastStr),
               ifname);
 
     if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_NEWADDR, ifname,
@@ -206,8 +206,8 @@ virNetDevIPAddrAdd(const char *ifname,
         virReportError(VIR_ERR_SYSTEM_ERROR,
                        _("Failed to add IP address %1$s/%2$d%3$s%4$s%5$s%6$s to %7$s"),
                        ipStr, prefix,
-                       peerStr ? " peer " : "", peerStr ? peerStr : "",
-                       bcastStr ? " bcast " : "", bcastStr ? bcastStr : "",
+                       peerStr ? " peer " : "", NULLSTR_EMPTY(peerStr),
+                       bcastStr ? " bcast " : "", NULLSTR_EMPTY(bcastStr),
                        ifname);
         return -1;
     }

diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
index 972b2f979c22e469710972c38540249ce6a7ef84..a0ac0d7f7116e529a3d58bccb19a752cd89e7ea9 100644 (file)
--- a/tools/virsh-checkpoint.c
+++ b/tools/virsh-checkpoint.c
@@ -455,7 +455,7 @@ cmdCheckpointInfo(vshControl *ctl,
                  _("unexpected problem querying checkpoint state"));
         return false;
     }
-    vshPrint(ctl, "%-15s %s\n", _("Parent:"), parent ? parent : "-");
+    vshPrint(ctl, "%-15s %s\n", _("Parent:"), NULLSTR_MINUS(parent));
 
     /* Children, Descendants.  */
     flags = 0;

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 74deca2f94928257b9b1ae09945e922c400e0fe5..37184baa6987bf870f178e46c5571639c12816b3 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -712,11 +712,11 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd)
         mac = virXPathString("string(./mac/@address)", ctxt);
 
         if (vshTableRowAppend(table,
-                              target ? target : "-",
+                              NULLSTR_MINUS(target),
                               type,
-                              source ? source : "-",
-                              model ? model : "-",
-                              mac ? mac : "-",
+                              NULLSTR_MINUS(source),
+                              NULLSTR_MINUS(model),
+                              NULLSTR_MINUS(mac),
                               NULL) < 0)
             return false;
     }

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 910eaefc9e039db6ca2797901c91cf07bd6df5ac..145faff3e70ed460fb7e6841b554a22b41491b2e 100644 (file)
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -1233,7 +1233,7 @@ cmdNodeDeviceInfo(vshControl *ctl, const vshCmd *cmd)
 
     parent = virNodeDeviceGetParent(device);
     vshPrint(ctl, "%-15s %s\n", _("Name:"), virNodeDeviceGetName(device));
-    vshPrint(ctl, "%-15s %s\n", _("Parent:"), parent ? parent : "");
+    vshPrint(ctl, "%-15s %s\n", _("Parent:"), NULLSTR_EMPTY(parent));
     vshPrint(ctl, "%-15s %s\n", _("Active:"), virNodeDeviceIsActive(device) ?
              _("yes") : _("no"));
     vshPrint(ctl, "%-15s %s\n", _("Persistent:"),