This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/admin/admin_server.c | 2 +- src/admin/admin_server_dispatch.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index f2c1a8f..f1e9667 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -291,7 +291,7 @@ adminClientGetInfo(virNetServerClientPtr client, if (virIdentityGetSELinuxContext(identity, &attr) < 0 || (attr && virTypedParamsAddString(&tmpparams, nparams, &maxparams, - VIR_CLIENT_INFO_SELINUX_CONTEXT, attr) < 0)) + VIR_CLIENT_INFO_SELINUX_CONTEXT, attr) < 0)) goto cleanup; *params = tmpparams; diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c index b78ff90..83e5953 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -396,8 +396,8 @@ adminDispatchServerSetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virTypedParamsDeserialize((virTypedParameterRemotePtr) args->params.params_val, - args->params.params_len, - ADMIN_SERVER_CLIENT_LIMITS_MAX, &params, &nparams) < 0) + args->params.params_len, + ADMIN_SERVER_CLIENT_LIMITS_MAX, &params, &nparams) < 0) goto cleanup; if (adminServerSetClientLimits(srv, params, nparams, args->flags) < 0) -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/cpu/cpu_ppc64.c | 4 ++-- src/cpu/cpu_x86.c | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 858f40e..96f9df1 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -488,7 +488,7 @@ ppc64Compute(virCPUDefPtr host, if (message && virAsprintf(message, _("host CPU vendor does not match required " - "CPU vendor %s"), + "CPU vendor %s"), cpu->vendor) < 0) goto cleanup; @@ -543,7 +543,7 @@ ppc64Compute(virCPUDefPtr host, if (message && virAsprintf(message, _("host CPU model does not match required " - "CPU model %s"), + "CPU model %s"), guest_model->name) < 0) goto cleanup; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 69a0c8d..e978cf0 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2040,12 +2040,8 @@ cpuidCall(virCPUx86CPUID *cpuid) asm("xor %%ebx, %%ebx;" /* clear the other registers as some cpuid */ "xor %%edx, %%edx;" /* functions may use them as additional arguments */ "cpuid;" - : "=a" (cpuid->eax), - "=b" (cpuid->ebx), - "=c" (cpuid->ecx), - "=d" (cpuid->edx) - : "a" (cpuid->eax_in), - "c" (cpuid->ecx_in)); + : "=a" (cpuid->eax), "=b" (cpuid->ebx), "=c" (cpuid->ecx), "=d" (cpuid->edx) + : "a" (cpuid->eax_in), "c" (cpuid->ecx_in)); # else /* we need to avoid direct use of ebx for CPUID output as it is used * for global offset table on i386 with -fPIC @@ -2056,12 +2052,8 @@ cpuidCall(virCPUx86CPUID *cpuid) "cpuid;" "mov %%ebx, %1;" "pop %%ebx;" - : "=a" (cpuid->eax), - "=r" (cpuid->ebx), - "=c" (cpuid->ecx), - "=d" (cpuid->edx) - : "a" (cpuid->eax_in), - "c" (cpuid->ecx_in) + : "=a" (cpuid->eax), "=r" (cpuid->ebx), "=c" (cpuid->ecx), "=d" (cpuid->edx) + : "a" (cpuid->eax_in), "c" (cpuid->ecx_in) : "cc"); # endif } -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/locking/lock_manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 9067f5a..8872334 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -44,8 +44,8 @@ VIR_LOG_INIT("locking.lock_manager"); #define CHECK_DRIVER(field, errret) \ if (!driver->field) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Missing '%s' field in lock manager driver"), \ - #field); \ + _("Missing '%s' field in lock manager driver"), \ + #field); \ return errret; \ } -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/libvirt-domain.c | 14 +++++++------- src/libvirt-host.c | 4 ++-- src/libvirt-lxc.c | 5 ++--- src/libvirt-network.c | 2 +- src/libvirt-nodedev.c | 4 ++-- src/libvirt-storage.c | 13 ++++++------- src/libvirt.c | 4 ++-- 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7690339..23f4889 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3626,7 +3626,7 @@ virDomainMigrate(virDomainPtr domain, } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_V2) && VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V2)) { + VIR_DRV_FEATURE_MIGRATION_V2)) { VIR_DEBUG("Using migration protocol 2"); ddomain = virDomainMigrateVersion2(domain, dconn, flags, dname, uri, bandwidth); @@ -3778,7 +3778,7 @@ virDomainMigrate2(virDomainPtr domain, } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_V2) && VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V2)) { + VIR_DRV_FEATURE_MIGRATION_V2)) { VIR_DEBUG("Using migration protocol 2"); if (dxml) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -3967,7 +3967,7 @@ virDomainMigrate3(virDomainPtr domain, } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_V2) && VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V2)) { + VIR_DRV_FEATURE_MIGRATION_V2)) { VIR_DEBUG("Using migration protocol 2"); if (dxml) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -11051,8 +11051,8 @@ virDomainFSFreeze(virDomainPtr dom, virCheckNullArgGoto(mountpoints, error); if (dom->conn->driver->domainFSFreeze) { - int ret = dom->conn->driver->domainFSFreeze( - dom, mountpoints, nmountpoints, flags); + int ret = dom->conn->driver->domainFSFreeze(dom, mountpoints, + nmountpoints, flags); if (ret < 0) goto error; return ret; @@ -11096,8 +11096,8 @@ virDomainFSThaw(virDomainPtr dom, virCheckNullArgGoto(mountpoints, error); if (dom->conn->driver->domainFSThaw) { - int ret = dom->conn->driver->domainFSThaw( - dom, mountpoints, nmountpoints, flags); + int ret = dom->conn->driver->domainFSThaw(dom, mountpoints, + nmountpoints, flags); if (ret < 0) goto error; return ret; diff --git a/src/libvirt-host.c b/src/libvirt-host.c index e20d6ee..a044924 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -784,7 +784,7 @@ virNodeSetMemoryParameters(virConnectPtr conn, if (conn->driver->nodeSetMemoryParameters) { int ret; ret = conn->driver->nodeSetMemoryParameters(conn, params, - nparams, flags); + nparams, flags); if (ret < 0) goto error; return ret; @@ -857,7 +857,7 @@ virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, int startCell, int maxCells) { VIR_DEBUG("conn=%p, freeMems=%p, startCell=%d, maxCells=%d", - conn, freeMems, startCell, maxCells); + conn, freeMems, startCell, maxCells); virResetLastError(); diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index 9bf0174..380d008 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -235,9 +235,8 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, } if (setexeccon(label->label) < 0) { - virReportSystemError(errno, - _("Cannot set context %s"), - label->label); + virReportSystemError(errno, _("Cannot set context %s"), + label->label); goto error; } #else diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 9f9e0dd..42e2b3b 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -1200,7 +1200,7 @@ virNetworkGetDHCPLeases(virNetworkPtr network, { virConnectPtr conn; VIR_DEBUG("network=%p, mac='%s' leases=%p, flags=0x%x", - network, NULLSTR(mac), leases, flags); + network, NULLSTR(mac), leases, flags); virResetLastError(); diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 10050b1..5a27a10 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -258,7 +258,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, conn->nodeDeviceDriver->nodeDeviceLookupSCSIHostByWWN) { virNodeDevicePtr ret; ret = conn->nodeDeviceDriver->nodeDeviceLookupSCSIHostByWWN(conn, wwnn, - wwpn, flags); + wwpn, flags); if (!ret) goto error; return ret; @@ -410,7 +410,7 @@ virNodeDeviceListCaps(virNodeDevicePtr dev, int maxnames) { VIR_DEBUG("dev=%p, conn=%p, names=%p, maxnames=%d", - dev, dev ? dev->conn : NULL, names, maxnames); + dev, dev ? dev->conn : NULL, names, maxnames); virResetLastError(); diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 2ea3e94..e65eee5 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -1561,8 +1561,10 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, if (pool->conn->storageDriver && pool->conn->storageDriver->storageVolCreateXMLFrom) { virStorageVolPtr ret; - ret = pool->conn->storageDriver->storageVolCreateXMLFrom(pool, xmlDesc, - clonevol, flags); + ret = pool->conn->storageDriver->storageVolCreateXMLFrom(pool, + xmlDesc, + clonevol, + flags); if (!ret) goto error; return ret; @@ -1709,11 +1711,8 @@ virStorageVolUpload(virStorageVolPtr vol, if (vol->conn->storageDriver && vol->conn->storageDriver->storageVolUpload) { int ret; - ret = vol->conn->storageDriver->storageVolUpload(vol, - stream, - offset, - length, - flags); + ret = vol->conn->storageDriver->storageVolUpload(vol, stream, offset, + length, flags); if (ret < 0) goto error; return ret; diff --git a/src/libvirt.c b/src/libvirt.c index 0a738ae..93d433f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -581,7 +581,7 @@ virRegisterConnectDriver(virConnectDriverPtr driver, } VIR_DEBUG("registering %s as driver %d", - driver->hypervisorDriver->name, virConnectDriverTabCount); + driver->hypervisorDriver->name, virConnectDriverTabCount); if (setSharedDrivers) { if (driver->interfaceDriver == NULL) @@ -1046,7 +1046,7 @@ virConnectOpenInternal(const char *name, i, virConnectDriverTab[i]->hypervisorDriver->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : - (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); + (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_SUCCESS) { break; -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/phyp/phyp_driver.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 05bf6df..96216c4 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1792,9 +1792,8 @@ phypDomainAttachDevice(virDomainPtr domain, const char *xml) ret = phypExecBuffer(session, &buf, &exit_status, conn, false); if (exit_status < 0 || ret == NULL) { - VIR_ERROR(_ - ("Possibly you don't have IBM Tools installed in your LPAR." - "Contact your support to enable this feature.")); + VIR_ERROR(_("Possibly you don't have IBM Tools installed in your LPAR." + " Contact your support to enable this feature.")); goto cleanup; } @@ -2825,9 +2824,8 @@ phypInterfaceDefineXML(virConnectPtr conn, const char *xml, if (system_type == HMC) virBufferAsprintf(&buf, "-m %s ", managed_system); - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth" - " -p %s -o r -s %d", def->name, slot); + virBufferAsprintf(&buf, " -r virtualio --rsubtype eth -p %s -o r -s %d", + def->name, slot); VIR_FREE(ret); ret = phypExecBuffer(session, &buf, &exit_status, conn, false); goto cleanup; @@ -3127,8 +3125,9 @@ phypConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames virBufferAddLit(&buf, "lssyscfg -r lpar"); if (system_type == HMC) virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAddLit(&buf, " -F name,state" - "|sed -n '/Not Activated/ {\n s/,.*$//\n p\n}'"); + virBufferAddLit(&buf, + " -F name,state" + "|sed -n '/Not Activated/ {\n s/,.*$//\n p\n}'"); ret = phypExecBuffer(session, &buf, &exit_status, conn, false); /* I need to parse the textual return in order to get the domains */ @@ -3605,7 +3604,7 @@ phypDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if (nvcpus > phypDomainGetMaxVcpus(dom)) { VIR_ERROR(_("You are trying to set a number of CPUs bigger than " - "the max possible.")); + "the max possible.")); return 0; } @@ -3628,8 +3627,7 @@ phypDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, ret = phypExecBuffer(session, &buf, &exit_status, dom->conn, false); if (exit_status < 0) { - VIR_ERROR(_ - ("Possibly you don't have IBM Tools installed in your LPAR." + VIR_ERROR(_("Possibly you don't have IBM Tools installed in your LPAR." " Contact your support to enable this feature.")); } -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/rpc/virnetclient.c | 40 +++++++++++++++++++---------------- src/rpc/virnetlibsshsession.c | 2 +- src/rpc/virnetservermdns.c | 4 ++-- src/rpc/virnetsocket.c | 23 +++++++++++--------- src/rpc/virnetsshsession.c | 2 +- 5 files changed, 39 insertions(+), 32 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index b4d8fb2..d2162d4 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -493,15 +493,17 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host, if (!(nc = virBufferContentAndReset(&buf))) goto no_memory; - virBufferAsprintf(&buf, - "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" - "else " - "ARG=;" - "fi;" - "'%s' $ARG -U %s'", - nc, nc, socketPath); +#define COMMAND_FORMAT "sh -c " \ + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " \ + "ARG=-q0;" \ + "else " \ + "ARG=;" \ + "fi;" \ + "'%s' $ARG -U %s'" + + virBufferAsprintf(&buf, COMMAND_FORMAT, nc, nc, socketPath); + +#undef COMMAND_FORMAT if (!(command = virBufferContentAndReset(&buf))) goto no_memory; @@ -601,17 +603,19 @@ virNetClientPtr virNetClientNewLibssh(const char *host, if (!(nc = virBufferContentAndReset(&buf))) goto no_memory; - if (virAsprintf(&command, - "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" - "else " - "ARG=;" - "fi;" - "'%s' $ARG -U %s'", - nc, nc, socketPath) < 0) +#define COMMAND_FORMAT "sh -c " \ + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " \ + "ARG=-q0;" \ + "else " \ + "ARG=;" \ + "fi;" \ + "'%s' $ARG -U %s'" + + if (virAsprintf(&command, COMMAND_FORMAT, nc, nc, socketPath) < 0) goto cleanup; +#undef COMMAND_FORMAT + if (virNetSocketNewConnectLibssh(host, port, family, username, privkey, diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 7c5f158..2422150 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -1124,7 +1124,7 @@ virNetLibsshSessionAuthAddKeyboardAuth(virNetLibsshSessionPtr sess, int virNetLibsshSessionSetChannelCommand(virNetLibsshSessionPtr sess, - const char *command) + const char *command) { int ret = 0; virObjectLock(sess); diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c index e0a9aef..3669998 100644 --- a/src/rpc/virnetservermdns.c +++ b/src/rpc/virnetservermdns.c @@ -347,8 +347,8 @@ static AvahiTimeout *virNetServerMDNSTimeoutNew(const AvahiPoll *api ATTRIBUTE_U } VIR_DEBUG("Trigger timed for %d %d %d %d", - (int)now.tv_sec, (int)now.tv_usec, - (int)(tv ? tv->tv_sec : 0), (int)(tv ? tv->tv_usec : 0)); + (int)now.tv_sec, (int)now.tv_usec, + (int)(tv ? tv->tv_sec : 0), (int)(tv ? tv->tv_usec : 0)); nowms = (now.tv_sec * 1000ll) + (now.tv_usec / 1000ll); if (tv) { thenms = (tv->tv_sec * 1000ll) + (tv->tv_usec/1000ll); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 55de3b2..5fe0930 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -634,7 +634,7 @@ int virNetSocketNewConnectUNIX(const char *path, bool daemonLaunched = false; VIR_DEBUG("path=%s spawnDaemon=%d binary=%s", path, spawnDaemon, - NULLSTR(binary)); + NULLSTR(binary)); memset(&localAddr, 0, sizeof(localAddr)); memset(&remoteAddr, 0, sizeof(remoteAddr)); @@ -883,14 +883,17 @@ int virNetSocketNewConnectSSH(const char *nodename, * Fedora's 'nc' doesn't have this option, and defaults to the desired * behavior. */ - virCommandAddArgFormat(cmd, - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" - "else " - "ARG=;" - "fi;" - "'%s' $ARG -U %s'", - quoted, quoted, path); +#define COMMAND_FORMAT "" \ + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " \ + "ARG=-q0;" \ + "else " \ + "ARG=;" \ + "fi;" \ + "'%s' $ARG -U %s'" + + virCommandAddArgFormat(cmd, COMMAND_FORMAT, quoted, quoted, path); + +#undef COMMAND_FORMAT VIR_FREE(quoted); return virNetSocketNewConnectCommand(cmd, retsock); @@ -1534,7 +1537,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, */ if (errno != EOPNOTSUPP) { virReportSystemError(errno, "%s", - _("Failed to get client socket PID")); + _("Failed to get client socket PID")); goto cleanup; } } diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 35dc6c5..1114036 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -462,7 +462,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) if (sess->knownHostsFile) { if (libssh2_knownhost_writefile(sess->knownHosts, sess->knownHostsFile, - LIBSSH2_KNOWNHOST_FILE_OPENSSH) < 0) { + LIBSSH2_KNOWNHOST_FILE_OPENSSH) < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, _("failed to write known_host file '%s': %s"), -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/uml/uml_driver.c | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index d1c71d8..73f1868 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -192,8 +192,8 @@ umlAutostartDomain(virDomainObjPtr vm, } else { virObjectEventPtr event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); virObjectEventStateQueue(data->driver->domainEventState, event); } } @@ -342,8 +342,8 @@ umlInotifyEvent(int watch, umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); virDomainAuditStop(dom, "shutdown"); event = virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); if (!dom->persistent) virDomainObjListRemove(driver->domains, dom); } else if (e.mask & (IN_CREATE | IN_MODIFY)) { @@ -373,8 +373,8 @@ umlInotifyEvent(int watch, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event = virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FAILED); + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); if (!dom->persistent) virDomainObjListRemove(driver->domains, dom); } else if (umlIdentifyChrPTY(driver, dom) < 0) { @@ -383,8 +383,8 @@ umlInotifyEvent(int watch, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event = virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FAILED); + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); if (!dom->persistent) virDomainObjListRemove(driver->domains, dom); } @@ -606,8 +606,8 @@ static void umlNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque) if (newVM) { virObjectEventPtr event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_DEFINED, - VIR_DOMAIN_EVENT_DEFINED_ADDED); + VIR_DOMAIN_EVENT_DEFINED, + VIR_DOMAIN_EVENT_DEFINED_ADDED); virObjectEventStateQueue(driver->domainEventState, event); } } @@ -736,8 +736,8 @@ static int umlProcessAutoDestroyDom(void *payload, umlShutdownVMDaemon(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); virDomainAuditStop(dom, "destroyed"); event = virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); if (!dom->persistent) virDomainObjListRemove(data->driver->domains, dom); @@ -1154,7 +1154,7 @@ static void umlShutdownVMDaemon(struct uml_driver *driver, if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) { VIR_WARN("Got unexpected pid %d != %d", - ret, vm->pid); + ret, vm->pid); } vm->pid = -1; @@ -1323,7 +1323,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid) static virDomainPtr umlDomainLookupByID(virConnectPtr conn, - int id) + int id) { struct uml_driver *driver = (struct uml_driver *)conn->privateData; virDomainObjPtr vm; @@ -1370,7 +1370,7 @@ static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn, } static virDomainPtr umlDomainLookupByName(virConnectPtr conn, - const char *name) + const char *name) { struct uml_driver *driver = (struct uml_driver *)conn->privateData; virDomainObjPtr vm; @@ -1566,8 +1566,8 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const char *xml, } virDomainAuditStart(vm, "booted", true); event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); @@ -1639,8 +1639,8 @@ umlDomainDestroyFlags(virDomainPtr dom, umlShutdownVMDaemon(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); virDomainAuditStop(vm, "destroyed"); event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); ret = 0; @@ -1758,7 +1758,7 @@ static int umlDomainSetMemory(virDomainPtr dom, unsigned long newmem) } static int umlDomainGetInfo(virDomainPtr dom, - virDomainInfoPtr info) + virDomainInfoPtr info) { struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -1901,8 +1901,8 @@ static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) virDomainAuditStart(vm, "booted", ret >= 0); if (ret == 0) event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); cleanup: virDomainObjEndAPI(&vm); @@ -2240,7 +2240,7 @@ umlDomainDetachDeviceFlags(virDomainPtr dom, static int umlDomainGetAutostart(virDomainPtr dom, - int *autostart) + int *autostart) { struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -2263,7 +2263,7 @@ static int umlDomainGetAutostart(virDomainPtr dom, } static int umlDomainSetAutostart(virDomainPtr dom, - int autostart) + int autostart) { struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -2437,7 +2437,7 @@ umlDomainOpenConsole(virDomainPtr dom, if (chr->source->type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), + _("character device %s is not using a PTY"), dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/vmx/vmx.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 937bf0c..3016f4f 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -803,8 +803,8 @@ virVMXGetConfigLong(virConfPtr conf, const char *name, long long *number, *number = -1; } else if (virStrToLong_ll(string, NULL, 10, number) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Config entry '%s' must represent an integer value"), - name); + _("Config entry '%s' must represent an integer value"), + name); goto cleanup; } @@ -1183,9 +1183,8 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDomainDefPtr def, if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && disk->info.addr.drive.controller == controller->idx) { - if (ctx->autodetectSCSIControllerModel - (disk, &autodetectedModels[count], - ctx->opaque) < 0) { + if (ctx->autodetectSCSIControllerModel( + disk, &autodetectedModels[count], ctx->opaque) < 0) { goto cleanup; } @@ -1667,8 +1666,8 @@ virVMXParseConfig(virVMXContext *ctx, } if (virVMXParseDisk(ctx, xmlopt, conf, VIR_DOMAIN_DISK_DEVICE_CDROM, - VIR_DOMAIN_DISK_BUS_SCSI, controller, unit, - &def->disks[def->ndisks], def) < 0) { + VIR_DOMAIN_DISK_BUS_SCSI, controller, unit, + &def->disks[def->ndisks], def) < 0) { goto cleanup; } @@ -1904,7 +1903,7 @@ virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def) if (port < 0) { VIR_WARN("VNC is enabled but VMX entry 'RemoteDisplay.vnc.port' " - "is missing, the VNC port is unknown"); + "is missing, the VNC port is unknown"); (*def)->data.vnc.port = 0; (*def)->data.vnc.autoport = true; @@ -3316,8 +3315,8 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe if (scsi_virtualDev[i] != -1) { virBufferAsprintf(&buffer, "scsi%zu.virtualDev = \"%s\"\n", i, - virVMXControllerModelSCSITypeToString - (scsi_virtualDev[i])); + virVMXControllerModelSCSITypeToString( + scsi_virtualDev[i])); } } } @@ -3461,7 +3460,7 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) if (def->data.vnc.autoport) { VIR_WARN("VNC autoport is enabled, but the automatically assigned " - "VNC port cannot be read back"); + "VNC port cannot be read back"); } else { if (def->data.vnc.port < 5900 || def->data.vnc.port > 5964) { VIR_WARN("VNC port %d it out of [5900..5964] range", @@ -3918,7 +3917,7 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported character device TCP protocol '%s'"), virDomainChrTcpProtocolTypeToString( - def->source->data.tcp.protocol)); + def->source->data.tcp.protocol)); return -1; } -- 2.17.1

This patch fixes misaligned arguments. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- src/xenapi/xenapi_utils.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 723f348..fee63c9 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -56,7 +56,7 @@ xenSessionFree(xen_session *session) char * xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username, - const char *hostname) + const char *hostname) { unsigned int ncred; virConnectCredential cred; @@ -107,7 +107,8 @@ xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify) if (virStrToLong_i(queryParam->value, NULL, 10, noVerify) < 0 || (*noVerify != 0 && *noVerify != 1)) { xenapiSessionErrorHandler(conn, VIR_ERR_INVALID_ARG, - _("Query parameter 'no_verify' has unexpected value (should be 0 or 1)")); + _("Query parameter 'no_verify' has " + "unexpected value (should be 0 or 1)")); goto failure; } } @@ -344,8 +345,9 @@ allocStringMap(xen_string_string_map **strings, char *key, char *val) { int sz = ((*strings) == NULL) ? 0 : (*strings)->size; sz++; - if (VIR_REALLOC_N(*strings, sizeof(xen_string_string_map) + - sizeof(xen_string_string_map_contents) * sz) < 0) + if (VIR_REALLOC_N(*strings, + (sizeof(xen_string_string_map) + + sizeof(xen_string_string_map_contents) * sz)) < 0) return -1; (*strings)->size = sz; if (VIR_STRDUP((*strings)->contents[sz-1].key, key) < 0 || @@ -532,7 +534,7 @@ createVMRecordFromXml(virConnectPtr conn, virDomainDefPtr def, (*record)->xenstore_data = xen_string_string_map_alloc(0); (*record)->hvm_shadow_multiplier = 1.000; if (!xen_vm_create(((struct _xenapiPrivate *)(conn->privateData))->session, - vm, *record)) { + vm, *record)) { xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL); return -1; } -- 2.17.1

Linefeed can be put behind the open-parenthesis of the function, the position of argument should be: 1) pos % 4 == 0 2) pos > start_of_function_name(includes func's parent_pointer) 3) pos is the first place which matches 1) and 2) E.g. [indent]if (virLongLongLongFunctionName( [4-spaces-align]LongLongLongFirstName, [4-spaces-align]LongLongLongSecondName) < 0) or [indent]ret = pointer->virFunctionName( [4-spaces-align]LongLongLongFirstName, [4-spaces-align]LongLongLongSecondName); Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- build-aux/check-spacing.pl | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/build-aux/check-spacing.pl b/build-aux/check-spacing.pl index d36b004..64a5dac 100755 --- a/build-aux/check-spacing.pl +++ b/build-aux/check-spacing.pl @@ -275,10 +275,10 @@ sub CheckMisalignment { my $pos = $$paren_stack[-1][0]; my $linenum = $$paren_stack[-1][1]; my $code = $$paren_stack[-1][2]; - if ($pos + 1 != length($`)) { + if ($pos != length($`)) { my $pad = ""; if ($. > $linenum + 1) { - $pad = " " x $pos . " ...\n"; + $pad = " " x $pos . "...\n"; } print "Misaligned line in parenthesis:\n"; print "$$file:$linenum-$.:\n$code$pad$$line\n"; @@ -291,6 +291,7 @@ sub CheckMisalignment { if ($$data =~ /.*[()]/) { my $pos = 0; my $temp = $$data; + $temp =~ s/\s+$//; # Kill the content between matched parenthesis and themselves # within the current line. @@ -310,9 +311,20 @@ sub CheckMisalignment { } # Push the item for open-paren on @paren_stack - # @item = [ position of the open-paren, linenum, code-line ] + # @item = [ correct-indent, linenum, code-line ] while (($pos = index($temp, "\(", $pos)) >= 0) { - push @$paren_stack, [$pos, $., $$line]; + if ($pos+1 == length($temp)) { + my $recent = rindex($temp, "\(", $pos-1) + 1; + my $correct = rindex($temp, " ", $pos-1) + 1; + $correct = ($correct >= $recent) ? $correct : $recent; + $correct += 4 - ($correct % 4); + if ($correct < $pos) { + push @$paren_stack, [$correct, $., $$line]; + last; + } + } + + push @$paren_stack, [$pos+1, $., $$line]; $pos++; } } @@ -370,7 +382,7 @@ foreach my $file (@ARGV) { # We _need_ fix these misalignment in batches. # We _should_ remove it as soon as fixing all. ##################################################################### - next unless $file =~ /^src\/util\//; + next unless $file =~ /^src\/(?!esx|qemu|hyperv|lxc|conf|libxl|vbox|test|security)/; $ret = 1 if CheckMisalignment(\$data, \$file, \$line, \@paren_stack); } -- 2.17.1

This patch replaces those 'my varname;' with 'our varname;', i.e. it uses global var, rather than passing arguments to subroutine. So it can be a bit faster. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com&gt; --- build-aux/check-spacing.pl | 218 ++++++++++++++++++------------------- 1 file changed, 107 insertions(+), 111 deletions(-) diff --git a/build-aux/check-spacing.pl b/build-aux/check-spacing.pl index 478e7ab..9e2a2a4 100755 --- a/build-aux/check-spacing.pl +++ b/build-aux/check-spacing.pl @@ -23,12 +23,15 @@ use strict; use warnings; +our $ret = 0; + # # CheckFunctionBody: # $_[0]: $data(in) -# $_[1]: $location(in), which format is file-path:line-num:line-code -# $_[2]: $fn_linenum(inout), maintains start line-num of function body -# Returns 0 in case of success or 1 on failure +# $_[1]: $file(in) +# $_[2]: $line(in) +# $_[3]: $fn_linenum(inout), maintains start line-num of function body +# Set $ret 1 on failure # # Check incorrect indentation and blank first line in function body. # For efficiency, it only checks the first line of function body. @@ -37,29 +40,28 @@ use warnings; # move it into this subroutine. But *state* requires version >= v5.10.) # sub CheckFunctionBody { - my $ret = 0; - my ($data, $location, $fn_linenum) = @_; + our ($data, $file, $line, $fn_linenum); # Check first line of function block - if ($$fn_linenum) { - if ($$data =~ /^\s*$/) { - print "Blank line before content in function body:\n$$location"; + if ($fn_linenum) { + if ($data =~ /^\s*$/) { + print "Blank line before content in function body:\n"; + print "$file:$.:\n$line"; $ret = 1; - } elsif ($$data !~ /^[ ]{4}\S/) { - unless ($$data =~ /^[ ]\w+:$/ || $$data =~ /^}/) { - print "Incorrect indentation in function body:\n$$location"; + } elsif ($data !~ /^[ ]{4}\S/) { + unless ($data =~ /^[ ]\w+:$/ || $data =~ /^}/) { + print "Incorrect indentation in function body:\n"; + print "$file:$.:\n$line"; $ret = 1; } } - $$fn_linenum = 0; + $fn_linenum = 0; } # Detect start of function block - if ($$data =~ /^{$/) { - $$fn_linenum = $.; + if ($data =~ /^{$/) { + $fn_linenum = $.; } - - return $ret; } # @@ -71,42 +73,40 @@ sub CheckFunctionBody { # (Also, the @incomment could be declared with *state* and move it in.) # sub KillComments { - my ($data, $incomment) = @_; + our ($data, $incomment); # Kill contents of multi-line comments # and detect end of multi-line comments - if ($$incomment) { - if ($$data =~ m,\*/,) { - $$incomment = 0; - $$data =~ s,^.*\*/,*/,; + if ($incomment) { + if ($data =~ m,\*/,) { + $incomment = 0; + $data =~ s,^.*\*/,*/,; } else { - $$data = ""; + $data = ""; } } # Kill single line comments, and detect # start of multi-line comments - if ($$data =~ m,/\*.*\*/,) { - $$data =~ s,/\*.*\*/,/* */,; - } elsif ($$data =~ m,/\*,) { - $$incomment = 1; - $$data =~ s,/\*.*,/*,; + if ($data =~ m,/\*.*\*/,) { + $data =~ s,/\*.*\*/,/* */,; + } elsif ($data =~ m,/\*,) { + $incomment = 1; + $data =~ s,/\*.*,/*,; } - - return; } # # CheckWhiteSpaces: # $_[0]: $data(in) -# $_[1]: $location(in), which format is file-path:line-num:line-code -# Returns 0 in case of success or 1 on failure +# $_[1]: $file(in) +# $_[1]: $line(in) +# Set $ret on failure # # Check whitespaces according to code spec of libvirt. # sub CheckWhiteSpaces { - my $ret = 0; - my ($data, $location) = @_; + our ($data, $file, $line); # We need to match things like # @@ -126,7 +126,7 @@ sub CheckWhiteSpaces { # later on. # For temporary modifications - my $tmpdata = $$data; + my $tmpdata = $data; while ($tmpdata =~ /(\w+)\s\((?!\*)/) { my $kw = $1; @@ -134,30 +134,34 @@ sub CheckWhiteSpaces { if ($kw =~ /^(?:if|for|while|switch|return)$/) { $tmpdata =~ s/(?:$kw\s\()/XXX(/; } else { - print "Whitespace after non-keyword:\n$$location"; + print "Whitespace after non-keyword:\n"; + print "$file:$.:\n$line"; $ret = 1; last; } } # Require whitespace immediately after keywords - if ($$data =~ /\b(?:if|for|while|switch|return)\(/) { - print "No whitespace after keyword:\n$$location"; + if ($data =~ /\b(?:if|for|while|switch|return)\(/) { + print "No whitespace after keyword:\n"; + print "$file:$.:\n$line"; $ret = 1; } # Forbid whitespace between )( of a function typedef - if ($$data =~ /\(\*\w+\)\s+\(/) { - print "Whitespace between ')' and '(':\n$$location"; + if ($data =~ /\(\*\w+\)\s+\(/) { + print "Whitespace between ')' and '(':\n"; + print "$file:$.:\n$line"; $ret = 1; } # Forbid whitespace following ( or prior to ) # but allow whitespace before ) on a single line # (optionally followed by a semicolon) - if (($$data =~ /\s\)/ && not $$data =~ /^\s+\);?$/) || - $$data =~ /\((?!$)\s/) { - print "Whitespace after '(' or before ')':\n$$location"; + if (($data =~ /\s\)/ && not $data =~ /^\s+\);?$/) || + $data =~ /\((?!$)\s/) { + print "Whitespace after '(' or before ')':\n"; + print "$file:$.:\n$line"; $ret = 1; } @@ -171,35 +175,37 @@ sub CheckWhiteSpaces { # errno == EINTR) # ; # - if ($$data =~ /\s[;,]/) { - unless ($$data =~ /\S; ; / || - $$data =~ /^\s+;/) { - print "Whitespace before semicolon or comma:\n$$location"; + if ($data =~ /\s[;,]/) { + unless ($data =~ /\S; ; / || + $data =~ /^\s+;/) { + print "Whitespace before semicolon or comma:\n"; + print "$file:$.:\n$line"; $ret = 1; } } # Require EOL, macro line continuation, or whitespace after ";". # Allow "for (;;)" as an exception. - if ($$data =~ /;[^ \\\n;)]/) { - print "Invalid character after semicolon:\n$$location"; + if ($data =~ /;[^ \\\n;)]/) { + print "Invalid character after semicolon:\n"; + print "$file:$.:\n$line"; $ret = 1; } # Require EOL, space, or enum/struct end after comma. - if ($$data =~ /,[^ \\\n)}]/) { - print "Invalid character after comma:\n$$location"; + if ($data =~ /,[^ \\\n)}]/) { + print "Invalid character after comma:\n"; + print "$file:$.:\n$line"; $ret = 1; } # Require spaces around assignment '=', compounds and '==' - if ($$data =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=/ || - $$data =~ /=[^= \\\n]/) { - print "Spacing around '=' or '==':\n$$location"; + if ($data =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=/ || + $data =~ /=[^= \\\n]/) { + print "Spacing around '=' or '==':\n"; + print "$file:$.:\n$line"; $ret = 1; } - - return $ret; } # @@ -210,46 +216,43 @@ sub CheckWhiteSpaces { # $_[3]: $cb_linenum(inout) # $_[4]: $cb_code(inout) # $_[5]: $cb_scolon(inout) -# Returns 0 in case of success or 1 on failure +# Set $ret 1 on failure # # Check whitespaces according to code spec of libvirt. # sub CheckCurlyBrackets { - my $ret = 0; - my ($data, $file, $line, $cb_linenum, $cb_code, $cb_scolon) = @_; + our ($data, $file, $line, $cb_linenum, $cb_code, $cb_scolon); # One line conditional statements with one line bodies should # not use curly brackets. - if ($$data =~ /^\s*(if|while|for)\b.*\{$/) { - $$cb_linenum = $.; - $$cb_code = $$line; - $$cb_scolon = 0; + if ($data =~ /^\s*(if|while|for)\b.*\{$/) { + $cb_linenum = $.; + $cb_code = $line; + $cb_scolon = 0; } # We need to check for exactly one semicolon inside the body, # because empty statements (e.g. with comment only) are # allowed - if ($$cb_linenum == $. - 1 && $$data =~ /^[^;]*;[^;]*$/) { - $$cb_code .= $$line; - $$cb_scolon = 1; + if ($cb_linenum == $. - 1 && $data =~ /^[^;]*;[^;]*$/) { + $cb_code .= $line; + $cb_scolon = 1; } - if ($$data =~ /^\s*}\s*$/ && - $$cb_linenum == $. - 2 && - $$cb_scolon) { + if ($data =~ /^\s*}\s*$/ && + $cb_linenum == $. - 2 && + $cb_scolon) { print "Curly brackets around single-line body:\n"; - print "$$file:$$cb_linenum-$.:\n$$cb_code$$line"; + print "$file:$cb_linenum-$.:\n$cb_code$line"; $ret = 1; # There _should_ be no need to reset the values; but to # keep my inner peace... - $$cb_linenum = 0; - $$cb_scolon = 0; - $$cb_code = ""; + $cb_linenum = 0; + $cb_scolon = 0; + $cb_code = ""; } - - return $ret; } # @@ -259,22 +262,21 @@ sub CheckCurlyBrackets { # $_[2]: $line(in) # $_[3]: @paren_stack(inout), which maintains information # of the parenthesis -# Returns 0 in case of success or 1 on failure +# Set $ret 1 on failure # # Check misaligned stuff in parenthesis: # 1. For misaligned arguments of function # 2. For misaligned conditions of [if|while|switch|...] # sub CheckMisalignment { - my $ret = 0; - my ($data, $file, $line, $paren_stack) = @_; + our ($data, $file, $line, @paren_stack); # Check alignment based on @paren_stack - if (@$paren_stack) { - if ($$data =~ /(\S+.*$)/) { - my $pos = $$paren_stack[-1][0]; - my $linenum = $$paren_stack[-1][1]; - my $code = $$paren_stack[-1][2]; + if (@paren_stack) { + if ($data =~ /(\S+.*$)/) { + my $pos = $paren_stack[-1][0]; + my $linenum = $paren_stack[-1][1]; + my $code = $paren_stack[-1][2]; if ($pos != length($`)) { my $pad = ""; my $indicator = ""; @@ -282,7 +284,7 @@ sub CheckMisalignment { $pad = " " x $pos . "...\n"; } print "Misaligned line in parenthesis:\n"; - print "$$file:$linenum-$.:\n$code$pad$$line"; + print "$file:$linenum-$.:\n$code$pad$line"; if ($pos > length($`)) { $indicator = " " x length($`); $indicator .= "~" x ($pos - length($`)); @@ -299,9 +301,9 @@ sub CheckMisalignment { } # Maintain @paren_stack - if ($$data =~ /.*[()]/) { + if ($data =~ /.*[()]/) { my $pos = 0; - my $temp = $$data; + my $temp = $data; $temp =~ s/\s+$//; # Kill the content between matched parenthesis and themselves @@ -310,12 +312,12 @@ sub CheckMisalignment { # Pop a item for the open-paren when finding close-paren while (($pos = index($temp, "\)", $pos)) >= 0) { - if (@$paren_stack) { - pop(@$paren_stack); + if (@paren_stack) { + pop(@paren_stack); $pos++; } else { print "Warning: found unbalanced parenthesis:\n"; - print "$$file:$.:\n$$line\n"; + print "$file:$.:\n$line\n"; $ret = 1; last; } @@ -330,36 +332,31 @@ sub CheckMisalignment { $correct = ($correct >= $recent) ? $correct : $recent; $correct += 4 - ($correct % 4); if ($correct < $pos) { - push @$paren_stack, [$correct, $., $$line]; + push @paren_stack, [$correct, $., $line]; last; } } - push @$paren_stack, [$pos+1, $., $$line]; + push @paren_stack, [$pos+1, $., $line]; $pos++; } } - - return $ret; } -my $ret = 0; - -foreach my $file (@ARGV) { +foreach our $file (@ARGV) { # Per-file variables for multiline Curly Bracket (cb_) check - my $cb_linenum = 0; - my $cb_code = ""; - my $cb_scolon = 0; - my $fn_linenum = 0; - my $incomment = 0; - my @paren_stack; + our $cb_linenum = 0; + our $cb_code = ""; + our $cb_scolon = 0; + our $fn_linenum = 0; + our $incomment = 0; + our @paren_stack = (); open FILE, $file; - while (defined (my $line = <FILE>)) { - my $has_define = 0; - my $data = $line; - my $location = "$file:$.:\n$line"; + while (defined (our $line = <FILE>)) { + our $has_define = 0; + our $data = $line; # Kill any quoted , ; = or " $data =~ s/'[";,=]'/'X'/g; @@ -376,14 +373,13 @@ foreach my $file (@ARGV) { # Ignore all macros except for #define next if $data =~ /^#/; - $ret = 1 if CheckFunctionBody(\$data, \$location, \$fn_linenum); + CheckFunctionBody(); - KillComments(\$data, \$incomment); + KillComments(); - $ret = 1 if CheckWhiteSpaces(\$data, \$location); + CheckWhiteSpaces(); - $ret = 1 if CheckCurlyBrackets(\$data, \$file, \$line, - \$cb_linenum, \$cb_code, \$cb_scolon); + CheckCurlyBrackets(); } ##################################################################### @@ -395,7 +391,7 @@ foreach my $file (@ARGV) { ##################################################################### next unless $file =~ /^src\/(?!esx|qemu|hyperv|lxc|conf|libxl|vbox|test|security)/; - $ret = 1 if CheckMisalignment(\$data, \$file, \$line, \@paren_stack); + CheckMisalignment(); } close FILE; } -- 2.17.1