Instead of using EMPTY_?STR with various meanings,
use a family of NULLSTR_.+ macros

Ján Tomko (6):
  internal: introduce a family of NULLSTR macros
  tools: use NULLSTR_MINUS
  Remove EMPTYSTR macro
  Remove EMPTY_STR macro
  Use NULLSTR_EMPTY
  Use NULLSTR_EMPTY even more

 src/datatypes.c                         |  2 +-
 src/interface/interface_backend_netcf.c | 42 ++++++++++++-------------
 src/internal.h                          | 14 +++++++--
 src/libvirt-admin.c                     |  2 +-
 src/libvirt.c                           |  2 +-
 src/lxc/lxc_controller.c                |  2 +-
 src/nwfilter/nwfilter_dhcpsnoop.c       |  2 +-
 src/qemu/qemu_command.c                 | 12 +++----
 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/virlease.c                     | 15 +++------
 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            |  6 ++--
 tools/virsh-domain.c                    |  2 +-
 tools/virsh-network.c                   | 10 +++---
 tools/virsh-snapshot.c                  |  2 +-
 tools/virt-admin.c                      |  4 +--
 26 files changed, 80 insertions(+), 85 deletions(-)

-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list