While I was working on the actual patch 5/5 I've found couple of possible cleanups (patches 1-4/5). This is all inspired by: https://www.redhat.com/archives/libvir-list/2020-September/msg00021.html Michal Prívozník (5): util: Check for HAVE_NET_IF_H correctly virfile.c: Remove some #endif comments meson: Drop checks for some functions and header files nss: Drop needless include of rpc/types.h lib: Prefer WITH_* prefix for #if conditionals build-aux/syntax-check.mk | 10 +-- docs/coding-style.rst | 2 +- meson.build | 63 +++++++++---------- src/admin/libvirt-admin.c | 4 +- src/conf/nwfilter_conf.c | 2 +- src/cpu/cpu_arm.c | 8 +-- src/internal.h | 8 +-- src/libvirt.c | 4 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_conf.c | 4 +- src/libxl/xen_xl.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/locking/lock_manager.c | 14 ++--- src/network/bridge_driver.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 8 +-- src/nwfilter/nwfilter_learnipaddr.c | 10 +-- src/qemu/qemu_namespace.c | 4 +- src/qemu/qemu_process.c | 6 +- src/rpc/virnetsocket.c | 8 +-- src/storage/storage_backend_rbd.c | 6 +- src/storage/storage_driver.c | 2 +- src/storage/storage_util.c | 6 +- src/util/iohelper.c | 2 +- src/util/virbpf.c | 6 +- src/util/virbpf.h | 6 +- src/util/vircgroupv2devices.c | 10 +-- src/util/virdbus.c | 2 +- src/util/virdbuspriv.h | 2 +- src/util/virfile.c | 94 ++++++++++++++-------------- src/util/virgettext.c | 6 +- src/util/virhostcpu.c | 14 ++--- src/util/virhostmem.c | 4 +- src/util/virhostuptime.c | 12 ++-- src/util/virlog.c | 24 +++---- src/util/virmodule.c | 6 +- src/util/virnetdev.c | 94 ++++++++++++++-------------- src/util/virnetdev.h | 4 +- src/util/virnetdevbridge.c | 46 +++++++------- src/util/virnetdevip.c | 16 ++--- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevtap.c | 6 +- src/util/virnetlink.c | 2 +- src/util/virnetlink.h | 2 +- src/util/virnuma.c | 12 ++-- src/util/virperf.c | 4 +- src/util/virprocess.c | 60 +++++++++--------- src/util/virstring.c | 8 +-- src/util/virthread.c | 4 +- src/util/virutil.c | 24 +++---- src/util/virutil.h | 8 +-- src/util/virvsock.c | 6 +- tests/eventtest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/meson.build | 2 +- tests/securityselinuxhelper.c | 2 +- tests/virfilemock.c | 2 +- tests/virfiletest.c | 14 ++--- tests/virmock.h | 2 +- tests/virmockstathelpers.c | 16 ++--- tests/virnetsockettest.c | 8 +-- tests/virnettlscontexttest.c | 2 +- tests/virnettlshelpers.c | 2 +- tests/virnettlshelpers.h | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virportallocatormock.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virstoragetest.c | 4 +- tests/vshtabletest.c | 2 +- tools/nss/libvirt_nss.c | 4 +- tools/nss/libvirt_nss.h | 4 +- tools/virt-host-validate.c | 4 +- tools/wireshark/src/packet-libvirt.c | 3 - 72 files changed, 371 insertions(+), 377 deletions(-) -- 2.26.2
