Re: [libvirt] ESX [07/12]: Whitespace cleanup

2009-09-14 Thread Daniel Veillard 
On Mon, Sep 14, 2009 at 02:43:33AM +0200, Matthias Bolte wrote:
 Subject says it all.

 diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
 index 745b744..8194b49 100644
 --- a/src/esx/esx_driver.c
 +++ b/src/esx/esx_driver.c
 @@ -752,13 +752,13 @@ esxGetHostname(virConnectPtr conn)
  }
  }
  
 -if (hostName == NULL || strlen (hostName)  1) {
 +if (hostName == NULL || strlen(hostName)  1) {
  ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
Missing or empty 'hostName' property);
  goto failure;
  }
  
 -if (domainName == NULL || strlen (domainName)  1) {
 +if (domainName == NULL || strlen(domainName)  1) {
  ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
Missing or empty 'domainName' property);
  goto failure;
 @@ -800,7 +800,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr 
 nodeinfo)
  int32_t numaInfo_numNodes = 0;
  char *ptr = NULL;
  
 -memset (nodeinfo, 0, sizeof (virNodeInfo));
 +memset(nodeinfo, 0, sizeof(virNodeInfo));
  
  if (priv-phantom) {
  ESX_ERROR(conn, VIR_ERR_OPERATION_INVALID,
 @@ -891,11 +891,11 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr 
 nodeinfo)
  
  /* Strip the string to fit more relevant information in 32 chars 
 */
  while (*ptr != '\0') {
 -if (STRPREFIX (ptr,   )) {
 -memmove(ptr, ptr + 1, strlen (ptr + 1) + 1);
 +if (STRPREFIX(ptr,   )) {
 +memmove(ptr, ptr + 1, strlen(ptr + 1) + 1);
  continue;
  } else if (STRPREFIX(ptr, (R)) || STRPREFIX(ptr, (C))) {
 -memmove(ptr, ptr + 3, strlen (ptr + 3) + 1);
 +memmove(ptr, ptr + 3, strlen(ptr + 3) + 1);
  continue;
  } else if (STRPREFIX(ptr, (TM))) {
  memmove(ptr, ptr + 4, strlen(ptr + 4) + 1);
 @@ -905,9 +905,9 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr 
 nodeinfo)
  ++ptr;
  }
  
 -strncpy (nodeinfo-model, dynamicProperty-val-string,
 - sizeof (nodeinfo-model) - 1);
 -nodeinfo-model[sizeof (nodeinfo-model) - 1] = '\0';
 +strncpy(nodeinfo-model, dynamicProperty-val-string,
 +sizeof(nodeinfo-model) - 1);
 +nodeinfo-model[sizeof(nodeinfo-model) - 1] = '\0';
  } else {
  VIR_WARN(Unexpected '%s' property, dynamicProperty-name);
  }
 @@ -1196,7 +1196,7 @@ esxDomainLookupByUUID(virConnectPtr conn, const 
 unsigned char *uuid)
  }
  
  if (memcmp(uuid, uuid_candidate,
 -   VIR_UUID_BUFLEN * sizeof (unsigned char)) != 0) {
 +   VIR_UUID_BUFLEN * sizeof(unsigned char)) != 0) {
  continue;
  }
  
 @@ -2732,7 +2732,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
   dynamicProperty != NULL  mask != 7  i  3;
   dynamicProperty = dynamicProperty-_next) {
  if (STREQ(dynamicProperty-name, config.cpuAllocation.reservation) 
 
 -!(mask  (1  0))) {
 +! (mask  (1  0))) {
  snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, %s,
reservation);
  
 @@ -2748,7 +2748,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
  ++i;
  } else if (STREQ(dynamicProperty-name,
   config.cpuAllocation.limit) 
 -   !(mask  (1  1))) {
 +   ! (mask  (1  1))) {
  snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, %s,
limit);
  
 @@ -2764,7 +2764,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
  ++i;
  } else if (STREQ(dynamicProperty-name,
   config.cpuAllocation.shares) 
 -   !(mask  (1  2))) {
 +   ! (mask  (1  2))) {
  snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, %s,
shares);
  
 diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
 index 38014de..7130a41 100644
 --- a/src/esx/esx_util.c
 +++ b/src/esx/esx_util.c
 @@ -271,7 +271,7 @@ esxUtil_ResolveHostname(virConnectPtr conn, const char 
 *hostname,
  struct addrinfo *result = NULL;
  int errcode;
  
 -memset(hints, 0, sizeof (struct addrinfo));
 +memset(hints, 0, sizeof(struct addrinfo));
  
  hints.ai_flags = AI_ADDRCONFIG;
  hints.ai_family = AF_INET;
 @@ -455,12 +455,12 @@ esxUtil_GetConfigLong(virConnectPtr conn, virConfPtr 
 conf, const char *name,
  
  int
  esxUtil_GetConfigBoolean(virConnectPtr conn, virConfPtr conf,
 - const char *name, int *boolval, int default_,
 + const char *name, int *boolean_, int default_,
   int optional)
  {
  virConfValuePtr value;
  
 -*boolval

[libvirt] ESX [07/12]: Whitespace cleanup

2009-09-13 Thread Matthias Bolte 
Subject says it all.
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 745b744..8194b49 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -752,13 +752,13 @@ esxGetHostname(virConnectPtr conn)
 }
 }
 
-if (hostName == NULL || strlen (hostName)  1) {
+if (hostName == NULL || strlen(hostName)  1) {
 ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
   Missing or empty 'hostName' property);
 goto failure;
 }
 
-if (domainName == NULL || strlen (domainName)  1) {
+if (domainName == NULL || strlen(domainName)  1) {
 ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
   Missing or empty 'domainName' property);
 goto failure;
@@ -800,7 +800,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo)
 int32_t numaInfo_numNodes = 0;
 char *ptr = NULL;
 
-memset (nodeinfo, 0, sizeof (virNodeInfo));
+memset(nodeinfo, 0, sizeof(virNodeInfo));
 
 if (priv-phantom) {
 ESX_ERROR(conn, VIR_ERR_OPERATION_INVALID,
@@ -891,11 +891,11 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo)
 
 /* Strip the string to fit more relevant information in 32 chars */
 while (*ptr != '\0') {
-if (STRPREFIX (ptr,   )) {
-memmove(ptr, ptr + 1, strlen (ptr + 1) + 1);
+if (STRPREFIX(ptr,   )) {
+memmove(ptr, ptr + 1, strlen(ptr + 1) + 1);
 continue;
 } else if (STRPREFIX(ptr, (R)) || STRPREFIX(ptr, (C))) {
-memmove(ptr, ptr + 3, strlen (ptr + 3) + 1);
+memmove(ptr, ptr + 3, strlen(ptr + 3) + 1);
 continue;
 } else if (STRPREFIX(ptr, (TM))) {
 memmove(ptr, ptr + 4, strlen(ptr + 4) + 1);
@@ -905,9 +905,9 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo)
 ++ptr;
 }
 
-strncpy (nodeinfo-model, dynamicProperty-val-string,
- sizeof (nodeinfo-model) - 1);
-nodeinfo-model[sizeof (nodeinfo-model) - 1] = '\0';
+strncpy(nodeinfo-model, dynamicProperty-val-string,
+sizeof(nodeinfo-model) - 1);
+nodeinfo-model[sizeof(nodeinfo-model) - 1] = '\0';
 } else {
 VIR_WARN(Unexpected '%s' property, dynamicProperty-name);
 }
@@ -1196,7 +1196,7 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
 }
 
 if (memcmp(uuid, uuid_candidate,
-   VIR_UUID_BUFLEN * sizeof (unsigned char)) != 0) {
+   VIR_UUID_BUFLEN * sizeof(unsigned char)) != 0) {
 continue;
 }
 
@@ -2732,7 +2732,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
  dynamicProperty != NULL  mask != 7  i  3;
  dynamicProperty = dynamicProperty-_next) {
 if (STREQ(dynamicProperty-name, config.cpuAllocation.reservation) 
-!(mask  (1  0))) {
+! (mask  (1  0))) {
 snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, %s,
   reservation);
 
@@ -2748,7 +2748,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
 ++i;
 } else if (STREQ(dynamicProperty-name,
  config.cpuAllocation.limit) 
-   !(mask  (1  1))) {
+   ! (mask  (1  1))) {
 snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, %s,
   limit);
 
@@ -2764,7 +2764,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
 ++i;
 } else if (STREQ(dynamicProperty-name,
  config.cpuAllocation.shares) 
-   !(mask  (1  2))) {
+   ! (mask  (1  2))) {
 snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, %s,
   shares);
 
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 38014de..7130a41 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -271,7 +271,7 @@ esxUtil_ResolveHostname(virConnectPtr conn, const char *hostname,
 struct addrinfo *result = NULL;
 int errcode;
 
-memset(hints, 0, sizeof (struct addrinfo));
+memset(hints, 0, sizeof(struct addrinfo));
 
 hints.ai_flags = AI_ADDRCONFIG;
 hints.ai_family = AF_INET;
@@ -455,12 +455,12 @@ esxUtil_GetConfigLong(virConnectPtr conn, virConfPtr conf, const char *name,
 
 int
 esxUtil_GetConfigBoolean(virConnectPtr conn, virConfPtr conf,
- const char *name, int *boolval, int default_,
+ const char *name, int *boolean_, int default_,
  int optional)
 {
 virConfValuePtr value;
 
-*boolval = default_;
+*boolean_ = default_;
 value = virConfGetValue(conf, name);
 
 if (value == NULL) {
@@ -485,9 +485,9 @@ esxUtil_GetConfigBoolean(virConnectPtr conn, virConfPtr conf,