NULLSTR_EMPTY, the quiet child, NULLSTR_STAR, the famous one and NULLSTR_MINUS, the grumpy one. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/internal.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/internal.h b/src/internal.h index 3f3e567ac9..7c11f57e33 100644 --- a/src/internal.h +++ b/src/internal.h @@ -245,6 +245,21 @@ */ # define EMPTYSTR(s) ((s) ? (s) : "-") +/* + * Turn a NULL string into an empty string + */ +# define NULLSTR_EMPTY(s) ((s) ? (s) : "") + +/* + * Turn a NULL string into a star + */ +# define NULLSTR_STAR(s) ((s) ? (s) : "*") + +/* + * Turn a NULL string into a minus sign + */ +# define NULLSTR_MINUS(s) ((s) ? (s) : "-") + /** * SWAP: * -- 2.20.1

Use the newly introduced macro in the few places that open-code it. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- tools/virsh-domain-monitor.c | 4 ++-- tools/virsh-snapshot.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 1897a626d5..49de81af8c 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -643,11 +643,11 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) "|./source/@volume)", ctxt); if (details) { if (vshTableRowAppend(table, type, device, target, - source ? source : "-", NULL) < 0) + NULLSTR_MINUS(source), NULL) < 0) goto cleanup; } else { if (vshTableRowAppend(table, target, - source ? source : "-", NULL) < 0) + NULLSTR_MINUS(source), NULL) < 0) goto cleanup; } diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 6d8e2b299b..90000ef1aa 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -945,7 +945,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) /* Since we already have the XML, there's no need to call * virDomainSnapshotGetParent */ parent = virXPathString("string(/domainsnapshot/parent/name)", ctxt); - vshPrint(ctl, "%-15s %s\n", _("Parent:"), parent ? parent : "-"); + vshPrint(ctl, "%-15s %s\n", _("Parent:"), NULLSTR_MINUS(parent)); /* Children, Descendants. After this point, the fallback to * compute children is too expensive, so we gracefully quit if the -- 2.20.1

This macro neither takes nor produces an empty string. Remove it in favor of NULLSTR_MINUS. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/internal.h | 5 ----- tools/virsh-network.c | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/internal.h b/src/internal.h index 7c11f57e33..cf03a82105 100644 --- a/src/internal.h +++ b/src/internal.h @@ -240,11 +240,6 @@ */ # define NULLSTR(s) ((s) ? (s) : "<null>") -/* - * Similar to NULLSTR, but print '-' to make it more user friendly. - */ -# define EMPTYSTR(s) ((s) ? (s) : "-") - /* * Turn a NULL string into an empty string */ diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 94adbabff7..9b86ef8071 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1398,11 +1398,11 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) if (vshTableRowAppend(table, expirytime, - EMPTYSTR(lease->mac), - EMPTYSTR(typestr), - EMPTYSTR(cidr_format), - EMPTYSTR(lease->hostname), - EMPTYSTR(lease->clientid), + NULLSTR_MINUS(lease->mac), + NULLSTR_MINUS(typestr), + NULLSTR_MINUS(cidr_format), + NULLSTR_MINUS(lease->hostname), + NULLSTR_MINUS(lease->clientid), NULL) < 0) goto cleanup; } -- 2.20.1

Another misleadingly named macro. Deprecate in favor of NULLSTR_STAR. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/util/virlease.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/util/virlease.c b/src/util/virlease.c index 7c6c37ec9d..93ca72e3af 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -42,13 +42,6 @@ #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024) -/* - * Use this when passing possibly-NULL strings to printf-a-likes. - * Required for unknown parameters during init call. - */ -#define EMPTY_STR(s) ((s) ? (s) : "*") - - int virLeaseReadCustomLeaseFile(virJSONValuePtr leases_array_new, const char *custom_lease_file, @@ -176,8 +169,8 @@ virLeasePrintLeases(virJSONValuePtr leases_array_new, expirytime, virJSONValueObjectGetString(lease_tmp, "mac-address"), virJSONValueObjectGetString(lease_tmp, "ip-address"), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "hostname")), + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "client-id"))); } } @@ -200,8 +193,8 @@ virLeasePrintLeases(virJSONValuePtr leases_array_new, expirytime, virJSONValueObjectGetString(lease_tmp, "iaid"), virJSONValueObjectGetString(lease_tmp, "ip-address"), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "hostname")), + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "client-id"))); } } } -- 2.20.1

Instead of repetitive: s ? s : "" use NULLSTR_EMPTY. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/datatypes.c | 2 +- src/libvirt-admin.c | 2 +- src/libvirt.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/qemu/qemu_command.c | 8 +++----- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_migration_params.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 4 ++-- src/util/vircgroupv1.c | 2 +- src/util/vircgroupv2.c | 2 +- src/util/virnetdevvportprofile.c | 4 ++-- src/util/virnuma.c | 4 ++-- src/util/virstoragefile.c | 2 +- src/util/virsystemd.c | 4 ++-- src/util/viruri.c | 2 +- src/xenconfig/xen_sxpr.c | 18 ++++++------------ tools/virsh-domain-monitor.c | 2 +- tools/virsh-domain.c | 2 +- tools/virt-admin.c | 4 ++-- 20 files changed, 32 insertions(+), 40 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index be9b5286aa..9b92d892d5 100644 --- 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/libvirt-admin.c b/src/libvirt-admin.c index fb0190042a..74dedf64d8 100644 --- 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 cc1c3c6ea1..854d70a2bf 100644 --- 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 9c6ea97f1e..cd842f2980 100644 --- 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/qemu/qemu_command.c b/src/qemu/qemu_command.c index 572d3bc20f..13f193a31d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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 2816db908a..c8effa68f4 100644 --- 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 28f2c75ea1..24e5368783 100644 --- 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 8bafa93c8d..cf474eb6c8 100644 --- 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 7536c1cbb0..a62d89320b 100644 --- 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 14b3b6a45d..c172eb8b96 100644 --- 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 655abfe42e..e0fa8e1cc0 100644 --- 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 574887e9e0..fb05190c02 100644 --- 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 67e6c86417..dd3fb7519e 100644 --- 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 8319ba9c8c..90dbbfdd15 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -4181,7 +4181,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 f492ac1859..b868f88a59 100644 --- 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 c8811f64c6..8e45a447b9 100644 --- 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 11af3e747a..eb535cde19 100644 --- 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 49de81af8c..ad739a9df5 100644 --- 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 0ea65e8994..07639ab8e3 100644 --- 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 e613ad86f9..048c805f0a 100644 --- 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; -- 2.20.1

This time even in places that would possibly better be served by a more complex macro. Can be squashed into the previous patch if requested. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/interface/interface_backend_netcf.c | 42 ++++++++++++------------- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_command.c | 4 +-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 27cc488f4b..cf8eb9488d 100644 --- 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/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 58f0057c3f..d8a1e7f8a8 100644 --- 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 13f193a31d..64d28b8751 100644 --- 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; } -- 2.20.1