There were unnecessary curly braces in few places (and the whole esx driver), so this series proposes fixing them. As this couldn't be done automatically, there is no syntax-check. We have to keep trying to eliminate that ;) Martin Kletzander (15): vbox: Remove useless condition branches Remove unneeded curly brackets around oneline code blocks in src/conf/ Remove unneeded curly brackets around oneline code blocks in src/esx/ Remove unneeded curly brackets around oneline code blocks in src/hyperv/ Remove unneeded curly brackets around oneline code blocks in src/node_device/ Remove unneeded curly brackets around oneline code blocks in src/qemu/ Remove unneeded curly brackets around oneline code blocks in src/util/ Remove unneeded curly brackets around oneline code blocks in src/vbox/ Remove unneeded curly brackets around oneline code blocks in src/vmx/ Remove unneeded curly brackets around oneline code blocks in src/[u-z]*/ Remove unneeded curly brackets around oneline code blocks in src/[st]*/ Remove unneeded curly brackets around oneline code blocks in src/[n-r]*/ Remove unneeded curly brackets around oneline code blocks in src/[a-m]*/ Remove unneeded curly brackets around oneline code blocks in tests/ Remove unneeded curly brackets around oneline code blocks daemon/libvirtd.c | 15 +- daemon/remote.c | 15 +- examples/object-events/event-test.c | 3 +- examples/openauth/openauth.c | 9 +- src/access/viraccessdriverstack.c | 3 +- src/bhyve/bhyve_driver.c | 3 +- src/conf/capabilities.c | 3 +- src/conf/device_conf.c | 6 +- src/conf/domain_conf.c | 203 +++----- src/conf/interface_conf.c | 9 +- src/conf/netdev_vport_profile_conf.c | 12 +- src/conf/network_conf.c | 114 ++-- src/conf/node_device_conf.c | 27 +- src/conf/nwfilter_conf.c | 24 +- src/conf/object_event.c | 6 +- src/conf/storage_conf.c | 30 +- src/cpu/cpu_powerpc.c | 3 +- src/cpu/cpu_x86.c | 3 +- src/datatypes.c | 6 +- src/driver.c | 3 +- src/esx/esx_device_monitor.c | 3 +- src/esx/esx_driver.c | 838 ++++++++++-------------------- src/esx/esx_interface_driver.c | 36 +- src/esx/esx_network_driver.c | 132 ++--- src/esx/esx_nwfilter_driver.c | 3 +- src/esx/esx_secret_driver.c | 3 +- src/esx/esx_storage_backend_iscsi.c | 78 +-- src/esx/esx_storage_backend_vmfs.c | 204 +++----- src/esx/esx_storage_driver.c | 81 +-- src/esx/esx_util.c | 51 +- src/esx/esx_vi.c | 606 +++++++-------------- src/esx/esx_vi_methods.c | 3 +- src/esx/esx_vi_types.c | 54 +- src/hyperv/hyperv_device_monitor.c | 3 +- src/hyperv/hyperv_driver.c | 132 ++--- src/hyperv/hyperv_interface_driver.c | 3 +- src/hyperv/hyperv_network_driver.c | 3 +- src/hyperv/hyperv_nwfilter_driver.c | 3 +- src/hyperv/hyperv_secret_driver.c | 3 +- src/hyperv/hyperv_storage_driver.c | 3 +- src/hyperv/hyperv_util.c | 6 +- src/hyperv/hyperv_wmi.c | 45 +- src/interface/interface_backend_udev.c | 15 +- src/libvirt-domain.c | 6 +- src/libvirt-lxc.c | 3 +- src/libvirt-nodedev.c | 3 +- src/libvirt-storage.c | 6 +- src/libxl/libxl_conf.c | 3 +- src/libxl/libxl_driver.c | 12 +- src/locking/lock_daemon.c | 9 +- src/locking/lock_driver_sanlock.c | 6 +- src/lxc/lxc_container.c | 12 +- src/lxc/lxc_driver.c | 12 +- src/lxc/lxc_process.c | 6 +- src/network/bridge_driver.c | 53 +- src/network/bridge_driver_linux.c | 9 +- src/network/leaseshelper.c | 3 +- src/node_device/node_device_driver.c | 33 +- src/node_device/node_device_hal.c | 6 +- src/node_device/node_device_udev.c | 222 +++----- src/nodeinfo.c | 3 +- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +- src/nwfilter/nwfilter_ebiptables_driver.c | 12 +- src/nwfilter/nwfilter_gentech_driver.c | 12 +- src/nwfilter/nwfilter_learnipaddr.c | 3 +- src/openvz/openvz_conf.c | 3 +- src/openvz/openvz_driver.c | 33 +- src/parallels/parallels_driver.c | 6 +- src/phyp/phyp_driver.c | 21 +- src/qemu/qemu_agent.c | 3 +- src/qemu/qemu_capabilities.c | 15 +- src/qemu/qemu_cgroup.c | 12 +- src/qemu/qemu_command.c | 42 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 9 +- src/qemu/qemu_driver.c | 57 +- src/qemu/qemu_hotplug.c | 42 +- src/qemu/qemu_migration.c | 18 +- src/qemu/qemu_monitor_json.c | 30 +- src/qemu/qemu_monitor_text.c | 9 +- src/qemu/qemu_process.c | 36 +- src/remote/remote_driver.c | 33 +- src/rpc/virnetclient.c | 9 +- src/rpc/virnetserver.c | 3 +- src/rpc/virnetserverclient.c | 3 +- src/rpc/virnetserverservice.c | 3 +- src/security/security_dac.c | 9 +- src/security/security_manager.c | 3 +- src/security/security_selinux.c | 6 +- src/security/virt-aa-helper.c | 15 +- src/storage/parthelper.c | 3 +- src/storage/storage_backend.c | 9 +- src/storage/storage_backend_disk.c | 21 +- src/storage/storage_backend_fs.c | 9 +- src/storage/storage_backend_mpath.c | 30 +- src/storage/storage_backend_rbd.c | 30 +- src/storage/storage_backend_scsi.c | 9 +- src/storage/storage_driver.c | 9 +- src/test/test_driver.c | 66 +-- src/uml/uml_conf.c | 6 +- src/uml/uml_driver.c | 9 +- src/util/virauth.c | 21 +- src/util/virbitmap.c | 6 +- src/util/virbuffer.c | 3 +- src/util/vircgroup.c | 3 +- src/util/vircommand.c | 12 +- src/util/virconf.c | 15 +- src/util/virdbus.c | 6 +- src/util/virdnsmasq.c | 6 +- src/util/vireventpoll.c | 12 +- src/util/virfile.c | 9 +- src/util/virfirewall.c | 6 +- src/util/virhostdev.c | 6 +- src/util/viriscsi.c | 12 +- src/util/virjson.c | 3 +- src/util/virlockspace.c | 6 +- src/util/virlog.c | 6 +- src/util/virnetdev.c | 12 +- src/util/virnetdevbridge.c | 3 +- src/util/virnetdevmacvlan.c | 15 +- src/util/virnetdevtap.c | 9 +- src/util/virnetdevvlan.c | 3 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virpci.c | 33 +- src/util/virsexpr.c | 30 +- src/util/virstorageencryption.c | 3 +- src/util/virstoragefile.c | 6 +- src/util/virsysinfo.c | 3 +- src/util/virthreadpool.c | 9 +- src/util/virutil.c | 12 +- src/util/virxml.c | 18 +- src/vbox/vbox_MSCOMGlue.c | 33 +- src/vbox/vbox_XPCOMCGlue.c | 33 +- src/vbox/vbox_common.c | 77 +-- src/vbox/vbox_network.c | 24 +- src/vbox/vbox_snapshot_conf.c | 21 +- src/vbox/vbox_storage.c | 30 +- src/vbox/vbox_tmpl.c | 30 +- src/vmware/vmware_conf.c | 9 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 369 +++++-------- src/xen/block_stats.c | 3 +- src/xen/xen_driver.c | 6 +- src/xen/xen_hypervisor.c | 12 +- src/xen/xen_inotify.c | 3 +- src/xen/xend_internal.c | 21 +- src/xen/xm_internal.c | 11 +- src/xenapi/xenapi_driver.c | 15 +- src/xenapi/xenapi_utils.c | 15 +- src/xenconfig/xen_common.c | 12 +- src/xenconfig/xen_sxpr.c | 12 +- src/xenconfig/xen_xm.c | 3 +- tests/commandhelper.c | 3 +- tests/esxutilstest.c | 18 +- tests/eventtest.c | 3 +- tests/networkxml2conftest.c | 3 +- tests/networkxml2xmltest.c | 3 +- tests/networkxml2xmlupdatetest.c | 3 +- tests/nodeinfotest.c | 3 +- tests/nwfilterxml2xmltest.c | 3 +- tests/openvzutilstest.c | 9 +- tests/qemuxml2argvtest.c | 6 +- tests/qemuxmlnstest.c | 3 +- tests/secretxml2xmltest.c | 3 +- tests/securityselinuxlabeltest.c | 6 +- tests/sexpr2xmltest.c | 3 +- tests/shunloadtest.c | 6 +- tests/storagepoolxml2xmltest.c | 3 +- tests/storagevolxml2argvtest.c | 3 +- tests/storagevolxml2xmltest.c | 3 +- tests/sysinfotest.c | 6 +- tests/utiltest.c | 3 +- tests/virbuftest.c | 3 +- tests/virhashtest.c | 42 +- tests/virtimetest.c | 3 +- tests/vmx2xmltest.c | 24 +- tests/xml2sexprtest.c | 3 +- tests/xml2vmxtest.c | 39 +- tools/virsh-console.c | 15 +- tools/virsh-domain.c | 30 +- tools/virsh-edit.c | 6 +- tools/virsh-host.c | 3 +- tools/virsh-interface.c | 6 +- tools/virsh-pool.c | 6 +- tools/virsh-volume.c | 15 +- tools/virsh.c | 18 +- tools/wireshark/src/packet-libvirt.c | 6 +- 187 files changed, 1746 insertions(+), 3474 deletions(-) -- 2.1.3 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list