Use NULLSTR_EMPTY

Instead of repetitive:
  s ? s : ""
use NULLSTR_EMPTY.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/datatypes.c b/src/datatypes.c
index be9b5286aa9f8582d57c9acd90c81c48f393c8b2..9b92d892d5c90546bad93a4c6996ee1d01884fde 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -686,7 +686,7 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid,
 
     memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
     ret->usageType = usageType;
-    if (VIR_STRDUP(ret->usageID, usageID ? usageID : "") < 0)
+    if (VIR_STRDUP(ret->usageID, NULLSTR_EMPTY(usageID)) < 0)
         goto error;
 
     ret->conn = virObjectRef(conn);

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 27cc488f4b80c180085c453d1a6e30306b61d802..cf8eb9488d1afb9b1efa6bfc1586ee36ba7ab2e8 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -290,7 +290,7 @@ static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfac
             virReportError(netcf_to_vir_err(errcode),
                            _("couldn't find interface named '%s': %s%s%s"),
                            ifinfo->name, errmsg, details ? " - " : "",
-                           details ? details : "");
+                           NULLSTR_EMPTY(details));
         } else {
             virReportError(VIR_ERR_NO_INTERFACE,
                            _("couldn't find interface named '%s'"),
@@ -314,7 +314,7 @@ netcfInterfaceObjIsActive(struct netcf_if *iface,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to get status of interface %s: %s%s%s"),
                        ncf_if_name(iface), errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -346,7 +346,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to get number of host interfaces: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -364,7 +364,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to list host interfaces: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -380,7 +380,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn,
                 virReportError(netcf_to_vir_err(errcode),
                                _("couldn't find interface named '%s': %s%s%s"),
                                names[i], errmsg,
-                               details ? " - " : "", details ? details : "");
+                               details ? " - " : "", NULLSTR_EMPTY(details));
                 goto cleanup;
             } else {
                 /* Ignore the NETCF_NOERROR, as the interface is very likely
@@ -436,7 +436,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to get number of host interfaces: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -454,7 +454,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to list host interfaces: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -475,7 +475,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn,
                 virReportError(netcf_to_vir_err(errcode),
                                _("couldn't find interface named '%s': %s%s%s"),
                                allnames[i], errmsg,
-                               details ? " - " : "", details ? details : "");
+                               details ? " - " : "", NULLSTR_EMPTY(details));
                 goto cleanup;
             } else {
                 /* Ignore the NETCF_NOERROR, as the interface is very likely
@@ -622,7 +622,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to get number of host interfaces: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -642,7 +642,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to list host interfaces: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -660,7 +660,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn,
                 virReportError(netcf_to_vir_err(errcode),
                                _("couldn't find interface named '%s': %s%s%s"),
                                names[i], errmsg,
-                               details ? " - " : "", details ? details : "");
+                               details ? " - " : "", NULLSTR_EMPTY(details));
                 goto cleanup;
             } else {
                 /* Ignore the NETCF_NOERROR, as the interface is very likely
@@ -740,7 +740,7 @@ static virInterfacePtr netcfInterfaceLookupByName(virConnectPtr conn,
             virReportError(netcf_to_vir_err(errcode),
                            _("couldn't find interface named '%s': %s%s%s"),
                            name, errmsg,
-                           details ? " - " : "", details ? details : "");
+                           details ? " - " : "", NULLSTR_EMPTY(details));
         } else {
             virReportError(VIR_ERR_NO_INTERFACE,
                            _("couldn't find interface named '%s'"), name);
@@ -780,7 +780,7 @@ static virInterfacePtr netcfInterfaceLookupByMACString(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("couldn't find interface with MAC address '%s': %s%s%s"),
                        macstr, errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
     if (niface == 0) {
@@ -844,7 +844,7 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo,
         virReportError(netcf_to_vir_err(errcode),
                        _("could not get interface XML description: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -906,7 +906,7 @@ static virInterfacePtr netcfInterfaceDefineXML(virConnectPtr conn,
         virReportError(netcf_to_vir_err(errcode),
                        _("could not get interface XML description: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -948,7 +948,7 @@ static int netcfInterfaceUndefine(virInterfacePtr ifinfo)
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to undefine interface %s: %s%s%s"),
                        ifinfo->name, errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -1000,7 +1000,7 @@ static int netcfInterfaceCreate(virInterfacePtr ifinfo,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to create (start) interface %s: %s%s%s"),
                        ifinfo->name, errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -1052,7 +1052,7 @@ static int netcfInterfaceDestroy(virInterfacePtr ifinfo,
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to destroy (stop) interface %s: %s%s%s"),
                        ifinfo->name, errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
         goto cleanup;
     }
 
@@ -1115,7 +1115,7 @@ static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to begin transaction: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
     }
 
     virObjectUnlock(driver);
@@ -1140,7 +1140,7 @@ static int netcfInterfaceChangeCommit(virConnectPtr conn, unsigned int flags)
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to commit transaction: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
     }
 
     virObjectUnlock(driver);
@@ -1165,7 +1165,7 @@ static int netcfInterfaceChangeRollback(virConnectPtr conn, unsigned int flags)
         virReportError(netcf_to_vir_err(errcode),
                        _("failed to rollback transaction: %s%s%s"),
                        errmsg, details ? " - " : "",
-                       details ? details : "");
+                       NULLSTR_EMPTY(details));
     }
 
     virObjectUnlock(driver);

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index fb0190042a1919f320ae6150c5966e56755ac999..74dedf64d8689b9e68000e1b157a0d7560ac8bb5 100644 (file)
--- a/src/libvirt-admin.c
+++ b/src/libvirt-admin.c
@@ -152,7 +152,7 @@ getSocketPath(virURIPtr uri)
         } else {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("Invalid URI path '%s', try '/system'"),
-                           uri->path ? uri->path : "");
+                           NULLSTR_EMPTY(uri->path));
             goto error;
         }
     }

diff --git a/src/libvirt.c b/src/libvirt.c
index cc1c3c6ea1111a2fbde94a15257e07a8fc04c0f4..854d70a2bf312409952ff58bf578db6ca6d8ef7b 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -898,7 +898,7 @@ virConnectOpenInternal(const char *name,
                         goto failed;
                     VIR_DEBUG("%s driver URI probe returned '%s'",
                               virConnectDriverTab[i]->hypervisorDriver->name,
-                              uristr ? uristr : "");
+                              NULLSTR_EMPTY(uristr));
                 }
             }
         }

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 9c6ea97f1eb9c7b78877d9985ca161771f50b82e..cd842f29808ed66f4c5ca4113aa68ca1dd7586c6 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -2160,7 +2160,7 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl)
     /* XXX should we support gid=X for X!=5 for distros which use
      * a different gid for tty?  */
     if (virAsprintf(&opts, "newinstance,ptmxmode=0666,mode=0620,gid=%u%s",
-                    ptsgid, (mount_options ? mount_options : "")) < 0)
+                    ptsgid, NULLSTR_EMPTY(mount_options)) < 0)
         goto cleanup;
 
     VIR_DEBUG("Mount devpts on %s type=tmpfs flags=0x%x, opts=%s",

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index 58f0057c3fc07f5486e2b68a86d4a4da1bf7ef56..d8a1e7f8a809579e51ba8bbb591f775c387ccd9e 100644 (file)
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -579,7 +579,7 @@ virNWFilterSnoopReqNew(const char *ifkey)
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("virNWFilterSnoopReqNew called with invalid "
                          "key \"%s\" (%zu)"),
-                       ifkey ? ifkey : "",
+                       NULLSTR_EMPTY(ifkey),
                        ifkey ? strlen(ifkey) : 0);
         return NULL;
     }

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c20d8b02a9f39a48d859f7baef61c0bc21eeee30..f511193fcab7bbc4cc39ae234e4105996d8951a0 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3726,9 +3726,9 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net)
                              virMacAddrFormat(&net->mac, macaddr),
                              net->info.alias,
                              (net->model ? ",model=" : ""),
-                             (net->model ? net->model : ""),
+                             NULLSTR_EMPTY(net->model),
                              (net->info.alias ? ",id=" : ""),
-                             (net->info.alias ? net->info.alias : "")));
+                             NULLSTR_EMPTY(net->info.alias)));
     return str;
 }
 
@@ -3964,8 +3964,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
 
     case VIR_DOMAIN_NET_TYPE_SERVER:
         virBufferAsprintf(&buf, "socket,listen=%s:%d,",
-                          net->data.socket.address ? net->data.socket.address
-                          : "",
+                          NULLSTR_EMPTY(net->data.socket.address),
                           net->data.socket.port);
         break;
 
@@ -7231,7 +7230,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
 
     if (cpu) {
         virCommandAddArg(cmd, "-cpu");
-        virCommandAddArgFormat(cmd, "%s%s", cpu, cpu_flags ? cpu_flags : "");
+        virCommandAddArgFormat(cmd, "%s%s", cpu, NULLSTR_EMPTY(cpu_flags));
     }
 
     ret = 0;
@@ -10729,8 +10728,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
             virCommandAddArg(cmd, qemucmd->args[i]);
         for (i = 0; i < qemucmd->num_env; i++)
             virCommandAddEnvPair(cmd, qemucmd->env_name[i],
-                                 qemucmd->env_value[i]
-                                 ? qemucmd->env_value[i] : "");
+                                 NULLSTR_EMPTY(qemucmd->env_value[i]));
     }
 
     if (qemuBuildSeccompSandboxCommandLine(cmd, cfg, qemuCaps) < 0)

diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index 2816db908a68c29a0248e08991f34e4586be00ec..c8effa68f4a515ce1b4b8023cfe7946e5ab3ad9a 100644 (file)
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -371,7 +371,7 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg,
         virReportError(VIR_ERR_INTERNAL_ERROR,
             _("%s: failed to communicate with bridge helper: %s%s"),
             cmdstr, virStrerror(errno, ebuf, sizeof(ebuf)),
-            errstr ? errstr : "");
+            NULLSTR_EMPTY(errstr));
         VIR_FREE(errstr);
         goto cleanup;
     }

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 28f2c75ea1d9db598ce5db674a919c844c477529..24e53687838ebab0e61ae2eb349ba88bc47cbb1c 100644 (file)
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -930,7 +930,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
                                      *tlsAlias) < 0 ||
         qemuMigrationParamsSetString(migParams,
                                      QEMU_MIGRATION_PARAM_TLS_HOSTNAME,
-                                     hostname ? hostname : "") < 0)
+                                     NULLSTR_EMPTY(hostname)) < 0)
         goto error;
 
     ret = 0;

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 8bafa93c8dfe4fe8a0ab1f4bcb4454aa095e9b97..cf474eb6c84e125cd6761894420d1878f9b3be3d 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1422,7 +1422,7 @@ qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
         const char *data;
 
         data = virJSONValueGetString(obj);
-        if (VIR_STRDUP(*reply_str, data ? data : "") < 0)
+        if (VIR_STRDUP(*reply_str, NULLSTR_EMPTY(data)) < 0)
             goto cleanup;
     }
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 7536c1cbb0606e8f3618d05780ccfc8ce54248ab..a62d89320b4b365ed866f5ad731b9d816158bbed 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4421,9 +4421,9 @@ qemuLogOperation(virDomainObjPtr vm,
                                   (qemuVersion / 1000000) % 1000,
                                   (qemuVersion / 1000) % 1000,
                                   qemuVersion % 1000,
-                                  package ? package : "",
+                                  NULLSTR_EMPTY(package),
                                   uts.release,
-                                  hostname ? hostname : "") < 0)
+                                  NULLSTR_EMPTY(hostname)) < 0)
         goto cleanup;
 
     if (cmd) {

diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 14b3b6a45d4ee1a9967e65c0d3e378bd5d538f46..c172eb8b9613262fd580f8608ca26a3dee59afb9 100644 (file)
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -532,7 +532,7 @@ virCgroupV1PathOfController(virCgroupPtr group,
     if (virAsprintf(path, "%s%s/%s",
                     group->legacy[controller].mountPoint,
                     group->legacy[controller].placement,
-                    key ? key : "") < 0)
+                    NULLSTR_EMPTY(key)) < 0)
         return -1;
 
     return 0;

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 655abfe42edd33a361a8934f40ac2259f64c09a5..e0fa8e1cc005d2e2ed45d3461bb3cbcb4e86c0a4 100644 (file)
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -338,7 +338,7 @@ virCgroupV2PathOfController(virCgroupPtr group,
     if (virAsprintf(path, "%s%s/%s",
                     group->unified.mountPoint,
                     group->unified.placement,
-                    key ? key : "") < 0)
+                    NULLSTR_EMPTY(key)) < 0)
         return -1;
 
     return 0;

diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 574887e9e009df2de167ba9b6b56c644acf1165e..fb05190c028de24b0be327b7477a718137582b21 100644 (file)
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -1239,7 +1239,7 @@ virNetDevVPortProfileAssociate(const char *macvtap_ifname,
 
     VIR_DEBUG("profile:'%p' vmOp: %s device: %s@%s mac: %s uuid: %s",
               virtPort, virNetDevVPortProfileOpTypeToString(vmOp),
-              (macvtap_ifname ? macvtap_ifname : ""), linkdev,
+              NULLSTR_EMPTY(macvtap_ifname), linkdev,
               (macvtap_macaddr
                ? virMacAddrFormat(macvtap_macaddr, macStr)
                : "(unspecified)"),
@@ -1305,7 +1305,7 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname,
 
     VIR_DEBUG("profile:'%p' vmOp: %s device: %s@%s mac: %s",
               virtPort, virNetDevVPortProfileOpTypeToString(vmOp),
-              (macvtap_ifname ? macvtap_ifname : ""), linkdev,
+              NULLSTR_EMPTY(macvtap_ifname), linkdev,
               (macvtap_macaddr
                ? virMacAddrFormat(macvtap_macaddr, macStr)
                : "(unspecified)"));

diff --git a/src/util/virnuma.c b/src/util/virnuma.c
index 67e6c86417f60de6fc1b9808d0f6b4d68cb82c0a..dd3fb7519e8606674ec15b29ee1331d126b9ba4b 100644 (file)
--- a/src/util/virnuma.c
+++ b/src/util/virnuma.c
@@ -487,13 +487,13 @@ virNumaGetHugePageInfoPath(char **path,
         /* We are aiming at overall system info */
         ret = virAsprintf(path,
                           HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%s",
-                          page_size, suffix ? suffix : "");
+                          page_size, NULLSTR_EMPTY(suffix));
     } else {
         /* We are aiming on specific NUMA node */
         ret = virAsprintf(path,
                           HUGEPAGES_NUMA_PREFIX "node%d/hugepages/"
                           HUGEPAGES_PREFIX "%ukB/%s",
-                          node, page_size, suffix ? suffix : "");
+                          node, page_size, NULLSTR_EMPTY(suffix));
     }
 
     if (ret >= 0 && !virFileExists(*path)) {

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 8d85d9dac49a4af11c7144c12579ec1e7ba795fd..a6d44b64a4ecf8506bedef421a7e8046edc2516a 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -4119,7 +4119,7 @@ virStorageFileRemoveLastPathComponent(const char *path)
 {
     char *ret;
 
-    if (VIR_STRDUP(ret, path ? path : "") < 0)
+    if (VIR_STRDUP(ret, NULLSTR_EMPTY(path)) < 0)
         return NULL;
 
     virFileRemoveLastComponent(ret);

diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index f492ac1859d1d541cfc34057a6234d8d40b04926..b868f88a59ccc2177ba8e258a924f964f4525131 100644 (file)
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -339,7 +339,7 @@ int virSystemdCreateMachine(const char *name,
                               creatorname,
                               iscontainer ? "container" : "vm",
                               (unsigned int)pidleader,
-                              rootdir ? rootdir : "",
+                              NULLSTR_EMPTY(rootdir),
                               nnicindexes, nicindexes,
                               3,
                               "Slice", "s", slicename,
@@ -381,7 +381,7 @@ int virSystemdCreateMachine(const char *name,
                               creatorname,
                               iscontainer ? "container" : "vm",
                               (unsigned int)pidleader,
-                              rootdir ? rootdir : "",
+                              NULLSTR_EMPTY(rootdir),
                               3,
                               "Slice", "s", slicename,
                               "After", "as", 1, "libvirtd.service",

diff --git a/src/util/viruri.c b/src/util/viruri.c
index c8811f64c6b420c2d49bc52cd4e404e5a69780f3..8e45a447b9b98b444f41a6596cabce40bd1de4f4 100644 (file)
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -117,7 +117,7 @@ virURIParseParams(virURIPtr uri)
         }
 
         /* Append to the parameter set. */
-        if (virURIParamAppend(uri, name, value ? value : "") < 0) {
+        if (virURIParamAppend(uri, name, NULLSTR_EMPTY(value)) < 0) {
             VIR_FREE(name);
             VIR_FREE(value);
             return -1;

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 11af3e747af3c728f6f52612259035dd83bc7589..eb535cde196a1448b64d3a9290564a9dbe3d6208 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1652,24 +1652,18 @@ xenFormatSxprChr(virDomainChrDefPtr def,
                           (def->source->data.tcp.protocol
                            == VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW ?
                            "tcp" : "telnet"),
-                          (def->source->data.tcp.host ?
-                           def->source->data.tcp.host : ""),
-                          (def->source->data.tcp.service ?
-                           def->source->data.tcp.service : ""),
+                          NULLSTR_EMPTY(def->source->data.tcp.host),
+                          NULLSTR_EMPTY(def->source->data.tcp.service),
                           (def->source->data.tcp.listen ?
                            ",server,nowait" : ""));
         break;
 
     case VIR_DOMAIN_CHR_TYPE_UDP:
         virBufferAsprintf(buf, "%s:%s:%s@%s:%s", type,
-                          (def->source->data.udp.connectHost ?
-                           def->source->data.udp.connectHost : ""),
-                          (def->source->data.udp.connectService ?
-                           def->source->data.udp.connectService : ""),
-                          (def->source->data.udp.bindHost ?
-                           def->source->data.udp.bindHost : ""),
-                          (def->source->data.udp.bindService ?
-                           def->source->data.udp.bindService : ""));
+                          NULLSTR_EMPTY(def->source->data.udp.connectHost),
+                          NULLSTR_EMPTY(def->source->data.udp.connectService),
+                          NULLSTR_EMPTY(def->source->data.udp.bindHost),
+                          NULLSTR_EMPTY(def->source->data.udp.bindService));
         break;
 
     case VIR_DOMAIN_CHR_TYPE_UNIX:

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 49de81af8c50b095062bcba0cefdc01c767a93f3..ad739a9df5544f245060b8301e963dcd5e08371c 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -2389,7 +2389,7 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd)
             if (full || !j)
                 vshPrint(ctl, " %-10s %-17s    %s\n",
                          iface->name,
-                         iface->hwaddr ? iface->hwaddr : "", ip_addr_str);
+                         NULLSTR_EMPTY(iface->hwaddr), ip_addr_str);
             else
                 vshPrint(ctl, " %-10s %-17s    %s\n",
                          "-", "-", ip_addr_str);

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index aa168e5bbaa88b48f3c2546fc851a7c3f510078c..5699018dcca072ed6f56bd59b7ee36f7a2062b45 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5524,7 +5524,7 @@ virshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime)
     strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info);
 
     if (virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom),
-                    timestr, ext ? ext : "") < 0) {
+                    timestr, NULLSTR_EMPTY(ext)) < 0) {
         vshError(ctl, "%s", _("Out of memory"));
         return NULL;
     }

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index e613ad86f9766f4fe6a33279722d3685ab3a0377..048c805f0ab0fc63eaaec527c505c7198ca7e1ea 100644 (file)
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -1047,7 +1047,7 @@ cmdDaemonLogFilters(vshControl *ctl, const vshCmd *cmd)
         }
 
         vshPrintExtra(ctl, " %-15s", _("Logging filters: "));
-        vshPrint(ctl, "%s\n", filters ? filters : "");
+        vshPrint(ctl, "%s\n", NULLSTR_EMPTY(filters));
     }
 
     return true;
@@ -1101,7 +1101,7 @@ cmdDaemonLogOutputs(vshControl *ctl, const vshCmd *cmd)
         }
 
         vshPrintExtra(ctl, " %-15s", _("Logging outputs: "));
-        vshPrint(ctl, "%s\n", outputs ? outputs : "");
+        vshPrint(ctl, "%s\n", NULLSTR_EMPTY(outputs));
     }
 
     return true;