On 06/12/2015 08:58 AM, Michal Privoznik wrote:
A variable can't be named system, obviously. Well, it can if the
compiler is new enough to distinguish a variable named system and a
function call system(). And some older systems, don't have wise
compiler. Whatever.
s/Whatever.//
CC util/libvirt_util_la-virsysinfo.lo
cc1: warnings being treated as errors
../../src/util/virsysinfo.c: In function 'virSysinfoParseSystem':
../../src/util/virsysinfo.c:649: error: declaration of 'system' shadows a global
declaration [-Wshadow]
/usr/include/stdlib.h:717: error: shadowed declaration is here [-Wshadow]
make[3]: *** [util/libvirt_util_la-virsysinfo.lo] Error 1
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/util/virsysinfo.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
OK - so according to cscope virSysinfoSystemParseXML (from your recent
commit '0b92974c' will also need adjustment)
ACK - with both adjusted...
John
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 692c921..42cd946 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -150,7 +150,7 @@ void virS ysinfoDefFree(virSysinfoDefPtr def)
#if defined(__powerpc__)
static int
-virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system)
+virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef)
{
int ret = -1;
char *eol = NULL;
@@ -193,7 +193,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr
*system)
def = NULL;
}
- *system = def;
+ *sysdef = def;
def = NULL;
ret = 0;
cleanup:
@@ -280,7 +280,7 @@ virSysinfoRead(void)
#elif defined(__arm__) || defined(__aarch64__)
static int
-virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system)
+virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef)
{
int ret = -1;
char *eol = NULL;
@@ -323,7 +323,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr
*system)
def = NULL;
}
- *system = def;
+ *sysdef = def;
def = NULL;
ret = 0;
cleanup:
@@ -452,7 +452,7 @@ virSysinfoParseLine(const char *base, const char *name, char
**value)
}
static int
-virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system)
+virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef)
{
int ret = -1;
virSysinfoSystemDefPtr def;
@@ -478,7 +478,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr
*system)
def = NULL;
}
- *system = def;
+ *sysdef = def;
def = NULL;
ret = 0;
cleanup:
@@ -646,7 +646,7 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios)
}
static int
-virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system)
+virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef)
{
int ret = -1;
const char *cur, *eol = NULL;
@@ -708,7 +708,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr
*system)
def = NULL;
}
- *system = def;
+ *sysdef = def;
def = NULL;
ret = 0;
cleanup: