On Tue, 2019-02-12 at 17:40 +0100, Ján Tomko wrote: > Instead of using EMPTY_?STR with various meanings, > use a family of NULLSTR_.+ macros I didn't check particularly well, but you seem to have missed a few: src/util/viriptables.c: portRangeStr ? portRangeStr : ""); src/util/viriptables.c: portRangeStr ? portRangeStr : ""); src/util/virnetdevip.c: peerStr ? " peer " : "", peerStr ? peerStr : "", src/util/virnetdevip.c: bcastStr ? " bcast " : "", bcastStr ? bcastStr : "", src/util/virnetdevip.c: peerStr ? " peer " : "", peerStr ? peerStr : "", src/util/virnetdevip.c: bcastStr ? " bcast " : "", bcastStr ? bcastStr : "", tests/domaincapstest.c: Machine ? "-" : "", Machine ? Machine : "", \ tools/virsh-domain-monitor.c: target ? target : "-", tools/virsh-domain-monitor.c: source ? source : "-", tools/virsh-domain-monitor.c: model ? model : "-", tools/virsh-domain-monitor.c: mac ? mac : "-", tools/virsh-domain.c: if (vshTableRowAppend(table, iothreadIdStr, pinInfo ? pinInfo : "", NULL) < 0) tools/virsh-domain.c: targets ? targets : "", You can just post a couple of follow-up patches to take care of those instead of respinning, it's gonna be more convenient for both of us ;) Please also consider adding a syntax-check rule to avoid more instances of the open coded version creeping in over time. -- Andrea Bolognani / Red Hat / Virtualization