External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-30 16:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsysinfo: s/system/sysdef/

Browse Source 
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.

  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@redhat.com>
This commit is contained in:
Michal Privoznik 2015-06-12 14:51:09 +02:00
parent c156856a2d
commit c1dff918c9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -11155,7 +11155,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node,
static int
virSysinfoSystemParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
virSysinfoSystemDefPtr *system,
virSysinfoSystemDefPtr *sysdef,
unsigned char *domUUID,
bool uuid_generated)
{
@ -11218,7 +11218,7 @@ virSysinfoSystemParseXML(xmlNodePtr node,
def = NULL;
}
*system = def;
*sysdef = def;
def = NULL;
ret = 0;
cleanup:

16
src/util/virsysinfo.c
View File

@ -150,7 +150,7 @@ void virSysinfoDefFree(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: