cleanup spaces between parentheses and braces

And add a syntax-check for '){$'.  It's not perfect, but better than
nothing.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index 4e302c8d048d67fbddeff01fc1edb815f2394a91..bf5cb7df46d0a03be295ae763f3cb44084b02a4a 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -943,6 +943,12 @@ sc_prohibit_empty_first_line:
          print "$(ME): Prohibited empty first line" > "/dev/stderr";   \
        } exit fail; }' $$($(VC_LIST_EXCEPT));
 
+sc_prohibit_paren_brace:
+       @prohibit='\)\{$$'                                              \
+       in_vc_files='\.[chx]$$'                                         \
+       halt='Put space between closing parenthesis and opening brace'  \
+         $(_sc_search_regexp)
+
 # We don't use this feature of maint.mk.
 prev_version_file = /dev/null
 

diff --git a/docs/java.html.in b/docs/java.html.in
index b5812bacd00a3d6333f2cda1fe59b4700a992cc8..daa7b769b20adee6def3aeb1f701b3bd86f70cb1 100644 (file)
--- a/docs/java.html.in
+++ b/docs/java.html.in
@@ -130,7 +130,7 @@ public class minitest {
         Connect conn=null;
         try{
             conn = new <span style="color: #0071FF; background-color: #FFFFFF">Connect</span>("test:///default", true);
-        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e){
+        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e) {
             System.out.println("exception caught:"+e);
             System.out.println(e.getError());
         }
@@ -139,7 +139,7 @@ public class minitest {
             System.out.println("Domain:" + testDomain.<span style="color: #E50073; background-color: #FFFFFF">getName</span>() + " id " +
                                testDomain.<span style="color: #E50073; background-color: #FFFFFF">getID</span>() + " running " +
                                testDomain.<span style="color: #E50073; background-color: #FFFFFF">getOSType</span>());
-        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e){
+        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e) {
             System.out.println("exception caught:"+e);
             System.out.println(e.getError());
         }

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d14191f8897ee8da678d48e74b27e5fb663ced3e..955702001e49f47a7e7f6f4704a18bdd06105c6a 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14423,7 +14423,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
                        dst->os.type, src->os.type);
         goto error;
     }
-    if (src->os.arch != dst->os.arch){
+    if (src->os.arch != dst->os.arch) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Target domain architecture %s does not match source %s"),
                        virArchToString(dst->os.arch),

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 025d08c8f6d2aa61720b20634348088b83e417e9..54290aed51747359b39e8d38110a79059ae48bf9 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -187,7 +187,7 @@ virNodeDeviceObjPtr virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs,
     }
     virNodeDeviceObjLock(device);
 
-    if (VIR_APPEND_ELEMENT_COPY(devs->objs, devs->count, device) < 0){
+    if (VIR_APPEND_ELEMENT_COPY(devs->objs, devs->count, device) < 0) {
         virNodeDeviceObjUnlock(device);
         virNodeDeviceObjFree(device);
         return NULL;

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index a12e645ff4a32ac6a13c0db64f46a8f2993e2645..e561943d8b8484453f44085e4e23c918b43be8d6 100644 (file)
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -724,7 +724,7 @@ addToTable(void *payload, const void *name, void *data)
         return;
     }
 
-    if (virNWFilterHashTablePut(atts->target, (const char *)name, val) < 0){
+    if (virNWFilterHashTablePut(atts->target, (const char *)name, val) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Could not put variable '%s' into hashmap"),
                        (const char *)name);

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index b61d8c02868f09fc45aceddfc2d17aaf7dd1e59b..5a16767f1600b12e203468de4da67bf826029f89 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -2122,7 +2122,7 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools,
                           def->source.adapter.data.fchost.wwpn))
                     matchpool = pool;
             } else if (pool->def->source.adapter.type ==
-                       VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST){
+                       VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST) {
                 if (pool->def->source.adapter.data.scsi_host.name) {
                     if (STREQ(pool->def->source.adapter.data.scsi_host.name,
                               def->source.adapter.data.scsi_host.name))

diff --git a/src/libvirt.c b/src/libvirt.c
index 992e4f2ae0fea938c123bc66b40abd120e249f87..834926187d61fdc7500dbb7cdfb3726e1c7c2ec7 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -7613,7 +7613,7 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams)
     virCheckDomainReturn(domain, NULL);
     conn = domain->conn;
 
-    if (conn->driver->domainGetSchedulerType){
+    if (conn->driver->domainGetSchedulerType) {
         schedtype = conn->driver->domainGetSchedulerType(domain, nparams);
         if (!schedtype)
             goto error;
@@ -10987,7 +10987,7 @@ virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
     virCheckConnectReturn(conn, NULL);
     virCheckNonNullArgGoto(uuid, error);
 
-    if (conn->networkDriver && conn->networkDriver->networkLookupByUUID){
+    if (conn->networkDriver && conn->networkDriver->networkLookupByUUID) {
         virNetworkPtr ret;
         ret = conn->networkDriver->networkLookupByUUID(conn, uuid);
         if (!ret)
@@ -14217,7 +14217,7 @@ virStorageVolGetInfo(virStorageVolPtr vol,
 
     conn = vol->conn;
 
-    if (conn->storageDriver->storageVolGetInfo){
+    if (conn->storageDriver->storageVolGetInfo) {
         int ret;
         ret = conn->storageDriver->storageVolGetInfo(vol, info);
         if (ret < 0)
@@ -16964,7 +16964,7 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
     virCheckConnectReturn(conn, NULL);
     virCheckNonNullArgGoto(uuid, error);
 
-    if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterLookupByUUID){
+    if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterLookupByUUID) {
         virNWFilterPtr ret;
         ret = conn->nwfilterDriver->nwfilterLookupByUUID(conn, uuid);
         if (!ret)

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index d65dda0d4b8d40b08f9fb6608bd378fbc13d5391..66d708af1cf1bfc1f8fa765e023dfe88c24b2ccd 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2193,7 +2193,7 @@ lxcDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
         } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) {
             if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0)
                 goto error;
-        } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){
+        } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
             if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0)
                 goto error;
         } else {
@@ -2606,7 +2606,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
                             break;
                         }
                     }
-                } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){
+                } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
                     for (j = 0; j < ndevices; j++) {
                         if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup,
                                                             devices[j].path,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c4d40c2be4a7b6ffc7f1d7aa44d9923f8d08e4c4..02088ccd45af88a6d7c8b261bc8614cbb5f66274 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7865,7 +7865,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
                             break;
                         }
                     }
-                } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){
+                } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
                     for (j = 0; j < ndevices; j++) {
                         if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup,
                                                             devices[j].path,

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 538110c062754f7ecfebebe90124618493b404a8..62e7d5d01656d6ba24cf2ec9f980c2419c4dcb19 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3868,7 +3868,7 @@ qemuMonitorJSONBlockJob(qemuMonitorPtr mon,
             virReportError(VIR_ERR_OPERATION_INVALID,
                            _("No active operation on device: %s"),
                            device);
-        } else if (qemuMonitorJSONHasError(reply, "DeviceInUse")){
+        } else if (qemuMonitorJSONHasError(reply, "DeviceInUse")) {
             virReportError(VIR_ERR_OPERATION_FAILED,
                            _("Device %s in use"), device);
         } else if (qemuMonitorJSONHasError(reply, "NotSupported")) {

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 032ff64fe866e25fff433f037f773634b625dfed..31aac9d4fb55b53e21206dccbad6591e4678e310 100644 (file)
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -1003,7 +1003,7 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt,
 
     memset(dname, 0, dnamesize);
 
-    if ((ret = gnutls_certificate_verify_peers2(sess->session, &status)) < 0){
+    if ((ret = gnutls_certificate_verify_peers2(sess->session, &status)) < 0) {
         virReportError(VIR_ERR_SYSTEM_ERROR,
                        _("Unable to verify TLS peer: %s"),
                        gnutls_strerror(ret));

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index f25a7df75e568485b25c1bf148353f97a7a6e7f3..a0b104c36425f81c03e6f5208f20137c86a29767 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1075,7 +1075,7 @@ get_files(vahControl * ctl)
                 ctl->def->fss[i]->type == VIR_DOMAIN_FS_TYPE_MOUNT &&
                 (ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH ||
                  ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) &&
-                ctl->def->fss[i]->src){
+                ctl->def->fss[i]->src) {
             virDomainFSDefPtr fs = ctl->def->fss[i];
 
             if (vah_add_path(&buf, fs->src, fs->readonly ? "r" : "rw", true) != 0)

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 5991fe78aaf951f35fbe7d7489128ca1fbafeb9f..d2c4aa99a295ceffea6c1a59b7c40906c6f5f4ed 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -332,7 +332,7 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile,
         if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s",
                         mac, ipstr, name) < 0)
             goto error;
-    } else if (name && !mac){
+    } else if (name && !mac) {
         if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s",
                         name, ipstr) < 0)
             goto error;

diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c
index 5a401b79b27b478f10574afea7b1a86662eb3405..b5fed580eb3937b0732ddadeab2932774a6edba8 100644 (file)
--- a/src/util/virstorageencryption.c
+++ b/src/util/virstorageencryption.c
@@ -193,7 +193,7 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt)
     ret->format = format;
 
     n = virXPathNodeSet("./secret", ctxt, &nodes);
-    if (n < 0){
+    if (n < 0) {
         goto cleanup;
     }
     if (n != 0 && VIR_ALLOC_N(ret->secrets, n) < 0)

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 79df3ee1eca5030b7efb2d1e3c5710a6418e0c73..0fc3aca700627f3bcc378da6fb98df91457198bb 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2534,7 +2534,7 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev)
     if (numdomains < 0) {
         return ret;
     }
-    if (numdomains > 0){
+    if (numdomains > 0) {
         if (VIR_ALLOC_N(ids, numdomains) < 0)
             goto out;
         if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) {

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 09aa1aac141ea89fad2a071ebaf0f1f44c81cca6..0931234f59ff2d4d20d8f7c36edba105769bc368 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -1194,7 +1194,7 @@ xenHypervisorGetSchedulerType(virConnectPtr conn,
         if (ret < 0)
             return NULL;
 
-        switch (op.u.getschedulerid.sched_id){
+        switch (op.u.getschedulerid.sched_id) {
             case XEN_SCHEDULER_SEDF:
                 ignore_value(VIR_STRDUP(schedulertype, "sedf"));
                 if (nparams)
@@ -1257,7 +1257,7 @@ xenHypervisorGetSchedulerParameters(virConnectPtr conn,
         if (ret < 0)
             return -1;
 
-        switch (op_sys.u.getschedulerid.sched_id){
+        switch (op_sys.u.getschedulerid.sched_id) {
             case XEN_SCHEDULER_SEDF:
                 if (*nparams < XEN_SCHED_SEDF_NPARAM) {
                     virReportError(VIR_ERR_INVALID_ARG,
@@ -1360,7 +1360,7 @@ xenHypervisorSetSchedulerParameters(virConnectPtr conn,
         ret = xenHypervisorDoV2Sys(priv->handle, &op_sys);
         if (ret == -1) return -1;
 
-        switch (op_sys.u.getschedulerid.sched_id){
+        switch (op_sys.u.getschedulerid.sched_id) {
         case XEN_SCHEDULER_SEDF:
             /* TODO: Implement for Xen/SEDF */
             TODO
@@ -1885,13 +1885,13 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
     if (virXen_getdomaininfo(fd, 0, &info) == 1) {
         /* RHEL 5.0 */
         hv_versions.dom_interface = 3; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver3");
             goto done;
         }
         /* Fedora 7 */
         hv_versions.dom_interface = 4; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver4");
             goto done;
         }
@@ -1901,7 +1901,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
     if (virXen_getdomaininfo(fd, 0, &info) == 1) {
         /* xen-3.1 */
         hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver3 dom ver5");
             goto done;
         }
@@ -1911,7 +1911,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
     if (virXen_getdomaininfo(fd, 0, &info) == 1) {
         /* Fedora 8 */
         hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver4 dom ver5");
             goto done;
         }
@@ -1921,7 +1921,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
     if (virXen_getdomaininfo(fd, 0, &info) == 1) {
         /* Xen 3.2, Fedora 9 */
         hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver6 dom ver5");
             goto done;
         }
@@ -1943,12 +1943,12 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
     hv_versions.sys_interface = 8; /* XEN_SYSCTL_INTERFACE_VERSION */
     if (virXen_getdomaininfo(fd, 0, &info) == 1) {
         hv_versions.dom_interface = 7; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver7");
             goto done;
         }
         hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver8");
             goto done;
         }
@@ -1961,7 +1961,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions)
     hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */
     if (virXen_getdomaininfo(fd, 0, &info) == 1) {
         hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */
-        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+        if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) {
             VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8");
             goto done;
         }

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 519a58f86ca214604d69ec96591f5e62936dbdc2..6d1fec7d982f35d0b03191605db0d107e65ff86a 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -2976,7 +2976,7 @@ xenDaemonGetSchedulerType(virConnectPtr conn,
 
     /* get xen_scheduler from xend/node */
     ret = sexpr_node(root, "node/xen_scheduler");
-    if (ret == NULL){
+    if (ret == NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("node information incomplete, missing scheduler name"));
         goto error;
@@ -3047,7 +3047,7 @@ xenDaemonGetSchedulerParameters(virConnectPtr conn,
         goto error;
     }
 
-    switch (sched_nparam){
+    switch (sched_nparam) {
         case XEN_SCHED_SEDF_NPARAM:
             if (*nparams < XEN_SCHED_SEDF_NPARAM) {
                 virReportError(VIR_ERR_INVALID_ARG,
@@ -3152,7 +3152,7 @@ xenDaemonSetSchedulerParameters(virConnectPtr conn,
         goto error;
     }
 
-    switch (sched_nparam){
+    switch (sched_nparam) {
         case XEN_SCHED_SEDF_NPARAM:
             /* TODO: Implement for Xen/SEDF */
             TODO

diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index 13cfa60386f556f42a8a0dc170a89e247c9ade96..8b93f4ecb793a471711dcb0e103f2c8a164910dc 100644 (file)
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -217,7 +217,7 @@ mymain(void)
         goto cleanup;
     }
 
-    if (uncomment_all_params(filedata, &params) < 0){
+    if (uncomment_all_params(filedata, &params) < 0) {
         perror("Find params");
         ret = -1;
         goto cleanup;

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index b528928741bf22968228e5e0b835553107661b4f..4f810f8a176b782d66035528a74501df43dd8524 100644 (file)
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -1123,7 +1123,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd)
     if (*capacityStr == '-') {
         /* The API always requires a positive value; but we allow a
          * negative value for convenience.  */
-        if (delta && vshCommandOptBool(cmd, "shrink")){
+        if (delta && vshCommandOptBool(cmd, "shrink")) {
             capacityStr++;
         } else {
             vshError(ctl, "%s",