External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: improve syntax check for space around =

Browse Source 
Laine Stump noted on IRC that syntax check wasn't flagging his
typo of 'i= 0'.  This fixes it.

* build-aux/bracket-spacing.pl: Tighten 'space around =' rule.
* src/storage/storage_backend.c
(virStorageBackendCreateExecCommand): Fix offenders.
* src/util/virnuma.c (virNumaGetDistances): Likewise.
* src/vbox/vbox_tmpl.c (vboxDomainSnapshotDeleteMetadataOnly)
(vboxNetworkGetXMLDesc): Likewise.
* src/xenapi/xenapi_driver.c (xenapiDomainLookupByName):
Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-08-11 17:04:19 -06:00
parent aad6e85f25
commit b50c8603a2
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build-aux/bracket-spacing.pl
View File

@ -32,8 +32,8 @@ foreach my $file (@ARGV) {
while (defined (my $line = <FILE>)) { while (defined (my $line = <FILE>)) {
my $data = $line; my $data = $line;
# Kill any quoted , ; or " # Kill any quoted , ; = or "
$data =~ s/'[";,]'/'X'/g; $data =~ s/'[";,=]'/'X'/g;
# Kill any quoted strings # Kill any quoted strings
$data =~ s,"([^\\\"]|\\.)*","XXX",g; $data =~ s,"([^\\\"]|\\.)*","XXX",g;
@ -147,10 +147,9 @@ foreach my $file (@ARGV) {
# Require spaces around assignment '=', compounds and '==' # Require spaces around assignment '=', compounds and '=='
# with the exception of virAssertCmpInt() # with the exception of virAssertCmpInt()
while ($data =~ /[^!<>&|\-+*\/%\^'= ]=\+[^=]/ || $data =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/;
$data =~ /[^!<>&|\-+*\/%\^'=]=[^= \\\n]/ || while ($data =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ ||
$data =~ /[\S]==/ || $data =~ /=[^= \\\n]/) {
($data =~ /==[^\s,]/ && $data !~ /[\s]virAssertCmpInt\(/)) {
print "$file:$.: $line"; print "$file:$.: $line";
$ret = 1; $ret = 1;
last; last;

2
src/storage/storage_backend.c
View File

@ -621,7 +621,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool,
if (virCommandRun(cmd, NULL) == 0) { if (virCommandRun(cmd, NULL) == 0) {
/* command was successfully run, check if the file was created */ /* command was successfully run, check if the file was created */
if (stat(vol->target.path, &st) >=0) if (stat(vol->target.path, &st) >= 0)
filecreated = true; filecreated = true;
} }
} }

2
src/util/virnuma.c
View File

@ -451,7 +451,7 @@ virNumaGetDistances(int node,
*ndistances = max_node + 1; *ndistances = max_node + 1;
for (i = 0; i<= max_node; i++) { for (i = 0; i <= max_node; i++) {
if (!virNumaNodeIsAvailable(node)) if (!virNumaNodeIsAvailable(node))
continue; continue;

6
src/vbox/vbox_tmpl.c
View File

@ -8397,7 +8397,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
virDomainPtr dom = snapshot->domain; virDomainPtr dom = snapshot->domain;
VBOX_OBJECT_CHECK(dom->conn, int, -1); VBOX_OBJECT_CHECK(dom->conn, int, -1);
virDomainSnapshotDefPtr def= NULL; virDomainSnapshotDefPtr def = NULL;
char *defXml = NULL; char *defXml = NULL;
vboxIID domiid = VBOX_IID_INITIALIZER; vboxIID domiid = VBOX_IID_INITIALIZER;
nsresult rc; nsresult rc;
@ -10173,7 +10173,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network,
&dhcpServer); &dhcpServer);
if (dhcpServer) { if (dhcpServer) {
ipdef->nranges = 1; ipdef->nranges = 1;
if (VIR_ALLOC_N(ipdef->ranges, ipdef->nranges) >=0) { if (VIR_ALLOC_N(ipdef->ranges, ipdef->nranges) >= 0) {
PRUnichar *ipAddressUtf16 = NULL; PRUnichar *ipAddressUtf16 = NULL;
PRUnichar *networkMaskUtf16 = NULL; PRUnichar *networkMaskUtf16 = NULL;
PRUnichar *fromIPAddressUtf16 = NULL; PRUnichar *fromIPAddressUtf16 = NULL;
@ -10211,7 +10211,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network,
} }
ipdef->nhosts = 1; ipdef->nhosts = 1;
if (VIR_ALLOC_N(ipdef->hosts, ipdef->nhosts) >=0) { if (VIR_ALLOC_N(ipdef->hosts, ipdef->nhosts) >= 0) {
if (VIR_STRDUP(ipdef->hosts[0].name, network->name) < 0) { if (VIR_STRDUP(ipdef->hosts[0].name, network->name) < 0) {
VIR_FREE(ipdef->hosts); VIR_FREE(ipdef->hosts);
ipdef->nhosts = 0; ipdef->nhosts = 0;

2
src/xenapi/xenapi_driver.c
View File

@ -691,7 +691,7 @@ xenapiDomainLookupByName(virConnectPtr conn,
} }
vm = vms->contents[0]; vm = vms->contents[0];
xen_vm_get_uuid(session, &uuid, vm); xen_vm_get_uuid(session, &uuid, vm);
if (uuid!=NULL) { if (uuid != NULL) {
ignore_value(virUUIDParse(uuid, raw_uuid)); ignore_value(virUUIDParse(uuid, raw_uuid));
domP = virGetDomain(conn, name, raw_uuid); domP = virGetDomain(conn, name, raw_uuid);
if (domP != NULL) { if (domP != NULL) {