diff mbox

Fwd: [PATCH] libxl: Avoid a variable named 'stat'

Message ID 73407666-1219-020c-e7f9-753594f31396@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

George Dunlap Aug. 24, 2017, 11:35 a.m. UTC 
Forwarding to the correct address...
 -G

-------- Forwarded Message --------
Subject: [PATCH] libxl: Avoid a variable named 'stat'
Date: Thu, 24 Aug 2017 12:34:13 +0100
From: George Dunlap <george.dunlap@citrix.com>
To: libvir-list@redhat.com
CC: George Dunlap <george.dunlap@citrix.com>, Daniel P . Berrange
<berrange@redhat.com>, Jim Fehlig <jfehlig@suse.com>,
xen-devel@xenproject.org

Using a variable named 'stat' clashes with the system function
'stat()' causing compiler warnings on some platforms:

libxl/libxl_driver.c: In function 'libxlDomainBlockStatsVBD':
libxl/libxl_driver.c:5387: error: declaration of 'stat' shadows a global
declaration [-Wshadow]
/usr/include/sys/stat.h:455: error: shadowed declaration is here [-Wshadow]

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---
CC: Daniel P. Berrange <berrange@redhat.com>
CC: Jim Fehlig <jfehlig@suse.com>
CC: xen-devel@xenproject.org
CC: libvir-list@redhat.com
---
 src/libxl/libxl_driver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

 # define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL)           \
     if ((virAsprintf(&name, "%s/"FIELD, path) < 0) || \
         (virFileReadAll(name, 256, &val) < 0) ||      \
-        (sscanf(val, "%llu", &stat) != 1)) {          \
+        (sscanf(val, "%llu", &status) != 1)) {          \
         virReportError(VIR_ERR_OPERATION_FAILED,      \
                        _("cannot read %s"), name);    \
         goto cleanup;                                 \
     }                                                 \
-    VAR += (stat * MUL);                              \
+    VAR += (status * MUL);                              \
     VIR_FREE(name);                                   \
     VIR_FREE(val);
 -- 2.14.1
diff mbox

Patch

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index c261e2155..4c7775358 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -5374,7 +5374,7 @@  libxlDomainBlockStatsVBD(virDomainObjPtr vm,
     int devno = libxlDiskPathToID(dev);
     int size;
     char *path, *name, *val;
-    unsigned long long stat;
+    unsigned long long status;
      path = name = val = NULL;
     if (devno < 0) {
@@ -5401,12 +5401,12 @@  libxlDomainBlockStatsVBD(virDomainObjPtr vm,