Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/nodeinfo.c | 4 ++-- src/xenapi/xenapi_driver.c | 27 ++++++++++++++--------------- src/xenapi/xenapi_utils.c | 4 ++-- 3 files changed, 17 insertions(+), 18 deletions(-) Actually, one more error is reported by syntax-check, but it's already fixed in "xenapi: Request a username if there is non in the URI" patch sent by Matthias yesterday: src/xenapi/xenapi_driver.c: if (passwd) VIR_FREE(passwd) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index bf57517..4858e71 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -162,10 +162,10 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, nodeinfo->cores = 1; nodeinfo->nodes = 1; -#if HAVE_NUMACTL +# if HAVE_NUMACTL if (numa_available() >= 0) nodeinfo->nodes = numa_max_node() + 1; -#endif +# endif /* NB: It is impossible to fill our nodes, since cpuinfo * has no knowledge of NUMA nodes */ diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 8d5c8bb..ad77068 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1716,11 +1716,11 @@ write_func(void *ptr, size_t size, size_t nmemb, void *comms_) { xen_comms *comms = comms_; size_t n = size * nmemb; - #ifdef PRINT_XML - printf("\n\n---Result from server -----------------------\n"); - printf("%s\n",((char*) ptr)); - fflush(stdout); - #endif +#ifdef PRINT_XML + printf("\n\n---Result from server -----------------------\n"); + printf("%s\n",((char*) ptr)); + fflush(stdout); +#endif return (size_t) (comms->func(ptr, n, comms->handle) ? n : 0); } @@ -1734,12 +1734,11 @@ call_func(const void *data, size_t len, void *user_handle, { //(void)user_handle; struct _xenapiPrivate *priv = (struct _xenapiPrivate *)user_handle; - #ifdef PRINT_XML - - printf("\n\n---Data to server: -----------------------\n"); - printf("%s\n",((char*) data)); - fflush(stdout); - #endif +#ifdef PRINT_XML + printf("\n\n---Data to server: -----------------------\n"); + printf("%s\n",((char*) data)); + fflush(stdout); +#endif CURL *curl = curl_easy_init(); if (!curl) { return -1; @@ -1750,9 +1749,9 @@ call_func(const void *data, size_t len, void *user_handle, }; curl_easy_setopt(curl, CURLOPT_URL, priv->url); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); - #ifdef CURLOPT_MUTE - curl_easy_setopt(curl, CURLOPT_MUTE, 1); - #endif +#ifdef CURLOPT_MUTE + curl_easy_setopt(curl, CURLOPT_MUTE, 1); +#endif curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_func); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &comms); curl_easy_setopt(curl, CURLOPT_POST, 1); diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 4b9a6d8..59edbf3 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -548,7 +548,7 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def, char macStr[VIR_MAC_STRING_BUFLEN]; virFormatMacAddr(def->nets[i]->mac, macStr); if (!(mac = strdup(macStr))) { - if (bridge) VIR_FREE(bridge); + VIR_FREE(bridge); goto error_cleanup; } } @@ -559,7 +559,7 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def, VIR_FREE(bridge); device_number++; } - if (bridge) VIR_FREE(bridge); + VIR_FREE(bridge); } } return 0; -- 1.7.0.2