External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 20:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_capabilities: fix build with for old gcc

Browse Source 
../../src/qemu/qemu_capabilities.c:3757: error: declaration of
'basename' shadows a global declaration [-Wshadow]

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-11-09 18:40:14 +01:00
parent cca34e38fd
commit b2260f93e2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_capabilities.c
View File

@ -3754,7 +3754,7 @@ virQEMUCapsQMPSchemaObjectGetType(const char *field,
static virJSONValuePtr
virQEMUCapsQMPSchemaTraverse(const char *basename,
virQEMUCapsQMPSchemaTraverse(const char *baseName,
char **query,
virHashTablePtr schema)
{
@ -3762,7 +3762,7 @@ virQEMUCapsQMPSchemaTraverse(const char *basename,
const char *metatype;
do {
if (!(base = virHashLookup(schema, basename)))
if (!(base = virHashLookup(schema, baseName)))
return NULL;
if (!*query)
@ -3773,25 +3773,25 @@ virQEMUCapsQMPSchemaTraverse(const char *basename,
/* flatten arrays by default */
if (STREQ(metatype, "array")) {
if (!(basename = virJSONValueObjectGetString(base, "element-type")))
if (!(baseName = virJSONValueObjectGetString(base, "element-type")))
return NULL;
continue;
} else if (STREQ(metatype, "object")) {
if (**query == '+')
basename = virQEMUCapsQMPSchemaObjectGetType("variants",
baseName = virQEMUCapsQMPSchemaObjectGetType("variants",
*query + 1,
"case", base);
else
basename = virQEMUCapsQMPSchemaObjectGetType("members",
baseName = virQEMUCapsQMPSchemaObjectGetType("members",
*query,
"name", base);
if (!basename)
if (!baseName)
return NULL;
} else if (STREQ(metatype, "command") ||
STREQ(metatype, "event")) {
if (!(basename = virJSONValueObjectGetString(base, *query)))
if (!(baseName = virJSONValueObjectGetString(base, *query)))
return NULL;
} else {
/* alternates, basic types and enums can't be entered */