There was a discussion some time ago (I don't even have the link to the ML archives) about spaces after casts. The opinions were diverse, however I decided to proceed anyway and make a rule out of it. The decision is explained with the reasoning behind it in the last commit, I don't want to repeat it here. This might cause a lot of collisions, but fear not as all the stuff these patches do can be automated. The way I did it was using this tiny neat command: git ls-files '*.[chx]' | xargs sed -i -E 's/((\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\))(([^ );,]))/\1 \6/g' So in case of a collision, you can run that on your patches, amend them and then rebase on top of this series. Of course this is not a semantic patch that is very precise, but practicality beats perfection. I roughly checked for false hits (both positive and negative) and I haven't found any. Martin Kletzander (29): admin: Add spaces after casts bhyve: Add spaces after casts conf: Add spaces after casts esx: Add spaces after casts hyperv: Add spaces after casts libxl: Add spaces after casts locking: Add spaces after casts logging: Add spaces after casts lxc: Add spaces after casts network: Add spaces after casts node_device: Add spaces after casts nwfilter: Add spaces after casts openvz: Add spaces after casts qemu: Add spaces after casts remote: Add spaces after casts rpc: Add spaces after casts storage: Add spaces after casts uml: Add spaces after casts util: Add spaces after casts vbox: Add spaces after casts vmware: Add spaces after casts vmx: Add spaces after casts vz: Add spaces after casts xenapi: Add spaces after casts xenconfig: Add spaces after casts tests: Add spaces after casts tools: Add spaces after casts libvirt-domain: Add spaces after casts Require space after cast cfg.mk | 6 ++ docs/hacking.html.in | 9 ++ include/libvirt/libvirt-domain.h | 4 +- src/admin/admin_remote.c | 8 +- src/bhyve/bhyve_process.c | 6 +- src/conf/capabilities.c | 4 +- src/conf/domain_audit.c | 6 +- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 76 +++++++-------- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 6 +- src/conf/nwfilter_params.c | 8 +- src/conf/snapshot_conf.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virsecretobj.c | 6 +- src/conf/virstorageobj.c | 4 +- src/esx/esx_driver.c | 18 ++-- src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 6 +- src/esx/esx_stream.c | 2 +- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 16 ++-- src/esx/esx_vi_types.c | 48 +++++----- src/hyperv/hyperv_driver.c | 60 ++++++------ src/hyperv/hyperv_wmi.c | 12 +-- src/libvirt-domain.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 6 +- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_logger.c | 2 +- src/libxl/libxl_migration.c | 2 +- src/locking/lock_daemon.c | 20 ++-- src/locking/lock_daemon_dispatch.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/logging/log_daemon.c | 16 ++-- src/logging/log_daemon_dispatch.c | 6 +- src/logging/log_manager.c | 18 ++-- src/lxc/lxc_container.c | 4 +- src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_fuse.c | 2 +- src/lxc/lxc_process.c | 10 +- src/network/bridge_driver.c | 10 +- src/node_device/node_device_hal.c | 106 ++++++++++----------- src/nwfilter/nwfilter_dhcpsnoop.c | 14 +-- src/nwfilter/nwfilter_ebiptables_driver.c | 22 ++--- src/nwfilter/nwfilter_gentech_driver.c | 6 +- src/nwfilter/nwfilter_learnipaddr.c | 8 +- src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_capabilities.c | 14 +-- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_domain.c | 14 +-- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 10 +- src/qemu/qemu_monitor_text.c | 6 +- src/qemu/qemu_process.c | 4 +- src/remote/remote_daemon.c | 4 +- src/remote/remote_daemon_dispatch.c | 10 +- src/remote/remote_driver.c | 110 +++++++++++----------- src/rpc/virnetsaslcontext.c | 4 +- src/rpc/virnetserverclient.c | 4 +- src/rpc/virnetservermdns.c | 4 +- src/rpc/virnetsshsession.c | 12 +-- src/rpc/virnettlscontext.c | 4 +- src/storage/storage_backend_disk.c | 4 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_gluster.c | 10 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 8 +- src/storage/storage_util.c | 8 +- src/uml/uml_driver.c | 18 ++-- src/util/viralloc.c | 16 ++-- src/util/viralloc.h | 2 +- src/util/virarptable.c | 2 +- src/util/viratomic.h | 64 ++++++------- src/util/vircgroup.c | 4 +- src/util/vircommand.c | 4 +- src/util/virconf.c | 30 +++--- src/util/virdbus.c | 66 ++++++------- src/util/virdnsmasq.c | 6 +- src/util/virfdstream.c | 2 +- src/util/virfile.c | 8 +- src/util/virfilecache.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virhash.c | 2 +- src/util/virhostmem.c | 10 +- src/util/viridentity.c | 4 +- src/util/viriscsi.c | 2 +- src/util/virjson.c | 22 ++--- src/util/virlockspace.c | 12 +-- src/util/virlog.c | 14 +-- src/util/virnetdev.c | 20 ++-- src/util/virnetdevbridge.c | 6 +- src/util/virnetdevip.c | 6 +- src/util/virnetdevmacvlan.c | 18 ++-- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 4 +- src/util/virnetlink.c | 18 ++-- src/util/virnodesuspend.c | 4 +- src/util/virobject.c | 2 +- src/util/virpidfile.c | 2 +- src/util/virpolkit.c | 4 +- src/util/virprobe.h | 2 +- src/util/virprocess.c | 22 ++--- src/util/virrandom.c | 2 +- src/util/virrotatingfile.c | 4 +- src/util/virstoragefile.c | 16 ++-- src/util/virsystemd.c | 6 +- src/util/virtime.c | 2 +- src/util/viruri.c | 2 +- src/util/virutil.c | 2 +- src/util/virutil.h | 6 +- src/util/virxml.c | 18 ++-- src/vbox/vbox_MSCOMGlue.c | 18 ++-- src/vbox/vbox_common.c | 108 ++++++++++----------- src/vbox/vbox_common.h | 4 +- src/vbox/vbox_snapshot_conf.c | 12 +-- src/vbox/vbox_storage.c | 10 +- src/vbox/vbox_tmpl.c | 26 ++--- src/vmware/vmware_conf.h | 2 +- src/vmx/vmx.c | 6 +- src/vz/vz_sdk.c | 20 ++-- src/vz/vz_utils.c | 2 +- src/xenapi/xenapi_driver.c | 86 ++++++++--------- src/xenapi/xenapi_utils.c | 30 +++--- src/xenconfig/xen_common.c | 6 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 6 +- tests/commandtest.c | 2 +- tests/esxutilstest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/nwfilterebiptablestest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemuxml2argvmock.c | 2 +- tests/securityselinuxhelper.c | 2 +- tests/testutils.c | 14 +-- tests/viralloctest.c | 4 +- tests/vircgroupmock.c | 18 ++-- tests/virdbusmock.c | 2 +- tests/virhashtest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/virnetdaemontest.c | 2 +- tests/virnetmessagetest.c | 12 +-- tests/virnetsockettest.c | 4 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlshelpers.c | 4 +- tests/virnettlssessiontest.c | 2 +- tests/virpcimock.c | 2 +- tests/virrandommock.c | 2 +- tests/virrotatingfiletest.c | 6 +- tests/virstringtest.c | 4 +- tests/virtypedparamtest.c | 2 +- tests/xml2vmxtest.c | 2 +- tools/nss/libvirt_nss.c | 4 +- tools/virsh-domain-monitor.c | 4 +- tools/virsh-domain.c | 36 +++---- tools/virsh-host.c | 4 +- tools/virsh-secret.c | 2 +- tools/virsh-volume.c | 2 +- tools/virt-host-validate-qemu.c | 2 +- tools/vsh.c | 4 +- tools/wireshark/src/packet-libvirt.c | 8 +- 165 files changed, 913 insertions(+), 898 deletions(-) -- 2.17.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list