My previous series ported a bunch of internal headers to use #pragma once as the header guard (per https://wiki.libvirt.org/page/BiteSizedTasks#Switch_headers_to_use_.23pragma_once). This series ports the rest of the internal headers. The public headers are unchanged, and the syntax check script now enforces using '#ifndef/#define/#endif' for public headers and '#pragma once' for internal headers. Jonathon Jongsma (46): src/locking: use #pragma once in headers src/lxc: use #pragma once in headers src/network: use #pragma once in headers src/nwfilter: use #pragma once in headers src/openvz: use #pragma once in headers src/phyp: use #pragma once in headers src/qemu: use #pragma once in headers src/remote: use #pragma once in headers src/rpc: use #pragma once in headers src/secret: use #pragma once in headers src/security: use #pragma once in headers src/storage: use #pragma once in headers src/test: use #pragma once in headers util: thread: use #pragma once in headers util: alloc: use #pragma once util: atomic: use #pragma once util: storage: use #pragma once in headers util: netdev: use #pragma once in headers util: arch.h: use #pragma once in headers util: file: use #pragma once in headers util: firewall: use #pragma once in headers util: host: use #pragma once in headers util: log: use #pragma once in headers util: cgroup: use #pragma once in headers util: error: use #pragma once in headers util: virprobe.h: use #pragma once in headers util: dbus: use #pragma once in headers util: command: use #pragma once in headers util: hash: use #pragma once in headers util: mac: use #pragma once in headers util: object: use #pragma once in headers util: string: use #pragma once in headers util: socketaddr: use #pragma once in headers util: sysinfo: use #pragma once in headers util: netlink: use #pragma once in headers util: xml: use #pragma once in headers util: scsi: use #pragma once in headers util: misc: use #pragma once in headers src/vbox: use #pragma once in headers src/vmware: use #pragma once in headers src/vmx: use #pragma once in headers src/vz: use #pragma once in headers xen: use #pragma once in headers tests: use #pragma once in headers tools: use #pragma once in headers syntax check: update header guard check build-aux/header-ifdef.pl | 35 +++-- src/locking/domain_lock.h | 11 +- src/locking/lock_daemon.h | 9 +- src/locking/lock_daemon_config.h | 7 +- src/locking/lock_daemon_dispatch.h | 7 +- src/locking/lock_driver.h | 18 +-- src/locking/lock_driver_lockd.h | 5 +- src/locking/lock_driver_nop.h | 8 +- src/locking/lock_manager.h | 9 +- src/lxc/lxc_cgroup.h | 13 +- src/lxc/lxc_conf.h | 47 +++--- src/lxc/lxc_container.h | 37 +++-- src/lxc/lxc_domain.h | 13 +- src/lxc/lxc_driver.h | 5 +- src/lxc/lxc_fuse.h | 15 +- src/lxc/lxc_hostdev.h | 9 +- src/lxc/lxc_monitor.h | 11 +- src/lxc/lxc_native.h | 11 +- src/lxc/lxc_process.h | 7 +- src/network/bridge_driver.h | 15 +- src/network/bridge_driver_platform.h | 15 +- src/nwfilter/nwfilter_dhcpsnoop.h | 6 +- src/nwfilter/nwfilter_driver.h | 9 +- src/nwfilter/nwfilter_ebiptables_driver.h | 13 +- src/nwfilter/nwfilter_gentech_driver.h | 11 +- src/nwfilter/nwfilter_learnipaddr.h | 13 +- src/nwfilter/nwfilter_tech_driver.h | 7 +- src/openvz/openvz_conf.h | 21 ++- src/openvz/openvz_driver.h | 11 +- src/openvz/openvz_util.h | 5 +- src/phyp/phyp_driver.h | 5 +- src/qemu/qemu_agent.h | 8 +- src/qemu/qemu_alias.h | 13 +- src/qemu/qemu_block.h | 17 +-- src/qemu/qemu_blockjob.h | 9 +- src/qemu/qemu_capabilities.h | 23 ++- src/qemu/qemu_capspriv.h | 5 +- src/qemu/qemu_cgroup.h | 12 +- src/qemu/qemu_command.h | 35 ++--- src/qemu/qemu_conf.h | 78 +++++----- src/qemu/qemu_domain.h | 81 +++++----- src/qemu/qemu_domain_address.h | 13 +- src/qemu/qemu_driver.h | 5 +- src/qemu/qemu_extdevice.h | 9 +- src/qemu/qemu_firmware.h | 13 +- src/qemu/qemu_hostdev.h | 9 +- src/qemu/qemu_hotplug.h | 11 +- src/qemu/qemu_hotplugpriv.h | 5 +- src/qemu/qemu_interface.h | 10 +- src/qemu/qemu_migration.h | 17 +-- src/qemu/qemu_migration_cookie.h | 9 +- src/qemu/qemu_migration_params.h | 19 +-- src/qemu/qemu_migration_paramspriv.h | 5 +- src/qemu/qemu_monitor.h | 27 ++-- src/qemu/qemu_monitor_json.h | 15 +- src/qemu/qemu_monitor_priv.h | 7 +- src/qemu/qemu_monitor_text.h | 9 +- src/qemu/qemu_parse_command.h | 9 +- src/qemu/qemu_process.h | 11 +- src/qemu/qemu_processpriv.h | 9 +- src/qemu/qemu_qapi.h | 12 +- src/qemu/qemu_security.h | 58 ++++--- src/qemu/qemu_tpm.h | 7 +- src/remote/remote_daemon.h | 35 ++--- src/remote/remote_daemon_config.h | 7 +- src/remote/remote_daemon_dispatch.h | 11 +- src/remote/remote_daemon_stream.h | 7 +- src/remote/remote_driver.h | 36 ++--- src/rpc/virkeepalive.h | 9 +- src/rpc/virnetclient.h | 41 +++-- src/rpc/virnetclientprogram.h | 15 +- src/rpc/virnetclientstream.h | 9 +- src/rpc/virnetdaemon.h | 21 ++- src/rpc/virnetlibsshsession.h | 9 +- src/rpc/virnetmessage.h | 7 +- src/rpc/virnetsaslcontext.h | 11 +- src/rpc/virnetserver.h | 17 +-- src/rpc/virnetserverclient.h | 19 +-- src/rpc/virnetservermdns.h | 7 +- src/rpc/virnetserverprogram.h | 11 +- src/rpc/virnetserverservice.h | 9 +- src/rpc/virnetsocket.h | 38 +++-- src/rpc/virnetsshsession.h | 9 +- src/rpc/virnettlscontext.h | 9 +- src/secret/secret_driver.h | 5 +- src/secret/secret_util.h | 8 +- src/security/security_apparmor.h | 13 +- src/security/security_dac.h | 7 +- src/security/security_driver.h | 11 +- src/security/security_manager.h | 13 +- src/security/security_nop.h | 7 +- src/security/security_selinux.h | 5 +- src/security/security_stack.h | 7 +- src/security/security_util.h | 5 +- src/storage/storage_backend.h | 13 +- src/storage/storage_backend_disk.h | 5 +- src/storage/storage_backend_fs.h | 5 +- src/storage/storage_backend_gluster.h | 5 +- src/storage/storage_backend_iscsi.h | 5 +- src/storage/storage_backend_iscsi_direct.h | 5 +- src/storage/storage_backend_logical.h | 5 +- src/storage/storage_backend_mpath.h | 5 +- src/storage/storage_backend_rbd.h | 5 +- src/storage/storage_backend_scsi.h | 5 +- src/storage/storage_backend_sheepdog.h | 5 +- src/storage/storage_backend_sheepdog_priv.h | 7 +- src/storage/storage_backend_vstorage.h | 5 +- src/storage/storage_backend_zfs.h | 5 +- src/storage/storage_driver.h | 11 +- src/storage/storage_file_fs.h | 5 +- src/storage/storage_file_gluster.h | 5 +- src/storage/storage_util.h | 31 ++-- src/test/test_driver.h | 7 +- src/util/viralloc.h | 101 ++++++------ src/util/virarch.h | 41 +++-- src/util/virarptable.h | 7 +- src/util/viratomic.h | 91 ++++++----- src/util/viraudit.h | 15 +- src/util/virauth.h | 8 +- src/util/virauthconfig.h | 9 +- src/util/virautoclean.h | 17 +-- src/util/virbitmap.h | 11 +- src/util/virbuffer.h | 19 +-- src/util/vircgroup.h | 10 +- src/util/vircgroupbackend.h | 15 +- src/util/vircgroupv1.h | 5 +- src/util/vircgroupv2.h | 5 +- src/util/virclosecallbacks.h | 6 +- src/util/vircommand.h | 11 +- src/util/vircommandpriv.h | 7 +- src/util/virconf.h | 9 +- src/util/vircrypto.h | 11 +- src/util/virdbus.h | 22 ++- src/util/virdbuspriv.h | 11 +- src/util/virdevmapper.h | 5 +- src/util/virdnsmasq.h | 20 ++- src/util/virebtables.h | 7 +- src/util/virendian.h | 19 +-- src/util/virenum.h | 11 +- src/util/virerror.h | 41 +++-- src/util/virerrorpriv.h | 5 +- src/util/virevent.h | 7 +- src/util/vireventpoll.h | 8 +- src/util/virfcp.h | 5 +- src/util/virfdstream.h | 6 +- src/util/virfile.h | 61 ++++---- src/util/virfilecache.h | 11 +- src/util/virfirewall.h | 11 +- src/util/virfirewalld.h | 7 +- src/util/virfirewalldpriv.h | 7 +- src/util/virfirewallpriv.h | 7 +- src/util/virfirmware.h | 8 +- src/util/virgettext.h | 5 +- src/util/virgic.h | 9 +- src/util/virhash.h | 8 +- src/util/virhashcode.h | 7 +- src/util/virhook.h | 7 +- src/util/virhostcpu.h | 17 +-- src/util/virhostcpupriv.h | 11 +- src/util/virhostdev.h | 19 +-- src/util/virhostmem.h | 7 +- src/util/viridentity.h | 8 +- src/util/virinitctl.h | 5 +- src/util/viriptables.h | 9 +- src/util/viriscsi.h | 7 +- src/util/virjson.h | 15 +- src/util/virkeycode.h | 9 +- src/util/virkeyfile.h | 7 +- src/util/virkmod.h | 6 +- src/util/virlease.h | 7 +- src/util/virlockspace.h | 9 +- src/util/virlog.h | 55 ++++--- src/util/virmacaddr.h | 17 +-- src/util/virmacmap.h | 5 +- src/util/virmdev.h | 15 +- src/util/virmodule.h | 5 +- src/util/virnetdev.h | 33 ++-- src/util/virnetdevbandwidth.h | 8 +- src/util/virnetdevbridge.h | 8 +- src/util/virnetdevip.h | 9 +- src/util/virnetdevmacvlan.h | 22 ++- src/util/virnetdevmidonet.h | 9 +- src/util/virnetdevopenvswitch.h | 13 +- src/util/virnetdevtap.h | 19 +-- src/util/virnetdevveth.h | 7 +- src/util/virnetdevvlan.h | 11 +- src/util/virnetdevvportprofile.h | 18 +-- src/util/virnetlink.h | 37 +++-- src/util/virnodesuspend.h | 7 +- src/util/virnuma.h | 10 +- src/util/virobject.h | 19 +-- src/util/virpci.h | 21 ++- src/util/virperf.h | 11 +- src/util/virpidfile.h | 9 +- src/util/virpolkit.h | 11 +- src/util/virportallocator.h | 9 +- src/util/virprobe.h | 63 ++++---- src/util/virprocess.h | 15 +- src/util/virqemu.h | 13 +- src/util/virrandom.h | 7 +- src/util/virresctrl.h | 12 +- src/util/virresctrlpriv.h | 7 +- src/util/virrotatingfile.h | 7 +- src/util/virscsi.h | 11 +- src/util/virscsihost.h | 7 +- src/util/virscsivhost.h | 13 +- src/util/virseclabel.h | 5 +- src/util/virsecret.h | 12 +- src/util/virsexpr.h | 9 +- src/util/virsocketaddr.h | 45 +++--- src/util/virstorageencryption.h | 17 +-- src/util/virstoragefile.h | 31 ++-- src/util/virstoragefilebackend.h | 9 +- src/util/virstring.h | 37 +++-- src/util/virsysinfo.h | 13 +- src/util/virsysinfopriv.h | 5 +- src/util/virsystemd.h | 7 +- src/util/virsystemdpriv.h | 7 +- src/util/virthread.h | 19 +-- src/util/virthreadjob.h | 6 +- src/util/virthreadpool.h | 9 +- src/util/virtime.h | 11 +- src/util/virtpm.h | 5 +- src/util/virtypedparam.h | 15 +- src/util/viruri.h | 15 +- src/util/virusb.h | 13 +- src/util/virutil.h | 47 +++--- src/util/viruuid.h | 9 +- src/util/virvhba.h | 7 +- src/util/virvsock.h | 4 +- src/util/virxdrdefs.h | 35 ++--- src/util/virxml.h | 33 ++-- src/vbox/vbox_MSCOMGlue.h | 11 +- src/vbox/vbox_common.h | 161 ++++++++++---------- src/vbox/vbox_driver.h | 19 +-- src/vbox/vbox_get_driver.h | 7 +- src/vbox/vbox_glue.h | 15 +- src/vbox/vbox_snapshot_conf.h | 9 +- src/vbox/vbox_uniformed_api.h | 11 +- src/vmware/vmware_conf.h | 19 +-- src/vmware/vmware_driver.h | 5 +- src/vmx/vmx.h | 21 ++- src/vz/vz_driver.h | 5 +- src/vz/vz_sdk.h | 9 +- src/vz/vz_utils.h | 37 +++-- src/xenapi/xenapi_driver.h | 5 +- src/xenapi/xenapi_driver_private.h | 17 +-- src/xenapi/xenapi_utils.h | 15 +- src/xenconfig/xen_common.h | 17 +-- src/xenconfig/xen_sxpr.h | 13 +- src/xenconfig/xen_xl.h | 11 +- src/xenconfig/xen_xm.h | 9 +- src/xenconfig/xenxs_private.h | 29 ++-- tests/qemumonitortestutils.h | 19 +-- tests/qemusecuritytest.h | 7 +- tests/testutils.h | 45 +++--- tests/testutilshostcpus.h | 11 +- tests/testutilslxc.h | 11 +- tests/testutilsqemu.h | 21 ++- tests/testutilsqemuschema.h | 11 +- tests/testutilsxen.h | 13 +- tests/virfilewrapper.h | 5 +- tests/virhashdata.h | 5 +- tests/virmock.h | 129 ++++++++-------- tests/virnettlshelpers.h | 17 +-- tools/nss/libvirt_nss.h | 27 ++-- tools/virsh-completer.h | 6 +- tools/virsh-console.h | 11 +- tools/virsh-domain-monitor.h | 7 +- tools/virsh-domain.h | 7 +- tools/virsh-host.h | 7 +- tools/virsh-interface.h | 9 +- tools/virsh-network.h | 9 +- tools/virsh-nodedev.h | 7 +- tools/virsh-nwfilter.h | 11 +- tools/virsh-pool.h | 9 +- tools/virsh-secret.h | 7 +- tools/virsh-snapshot.h | 7 +- tools/virsh-util.h | 11 +- tools/virsh-volume.h | 9 +- tools/virsh.h | 77 +++++----- tools/virt-admin-completer.h | 6 +- tools/virt-admin.h | 11 +- tools/virt-host-validate-bhyve.h | 5 +- tools/virt-host-validate-common.h | 13 +- tools/virt-host-validate-lxc.h | 5 +- tools/virt-host-validate-qemu.h | 5 +- tools/vsh-table.h | 7 +- tools/vsh.h | 87 +++++------ tools/wireshark/src/packet-libvirt.h | 5 +- 290 files changed, 1808 insertions(+), 2648 deletions(-) -- 2.20.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
