mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 03:21:19 +00:00
qemu_capabilities: fix build with for old gcc
../../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:
parent
cca34e38fd
commit
b2260f93e2
@ -3754,7 +3754,7 @@ virQEMUCapsQMPSchemaObjectGetType(const char *field,
|
|||||||
|
|
||||||
|
|
||||||
static virJSONValuePtr
|
static virJSONValuePtr
|
||||||
virQEMUCapsQMPSchemaTraverse(const char *basename,
|
virQEMUCapsQMPSchemaTraverse(const char *baseName,
|
||||||
char **query,
|
char **query,
|
||||||
virHashTablePtr schema)
|
virHashTablePtr schema)
|
||||||
{
|
{
|
||||||
@ -3762,7 +3762,7 @@ virQEMUCapsQMPSchemaTraverse(const char *basename,
|
|||||||
const char *metatype;
|
const char *metatype;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (!(base = virHashLookup(schema, basename)))
|
if (!(base = virHashLookup(schema, baseName)))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (!*query)
|
if (!*query)
|
||||||
@ -3773,25 +3773,25 @@ virQEMUCapsQMPSchemaTraverse(const char *basename,
|
|||||||
|
|
||||||
/* flatten arrays by default */
|
/* flatten arrays by default */
|
||||||
if (STREQ(metatype, "array")) {
|
if (STREQ(metatype, "array")) {
|
||||||
if (!(basename = virJSONValueObjectGetString(base, "element-type")))
|
if (!(baseName = virJSONValueObjectGetString(base, "element-type")))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
} else if (STREQ(metatype, "object")) {
|
} else if (STREQ(metatype, "object")) {
|
||||||
if (**query == '+')
|
if (**query == '+')
|
||||||
basename = virQEMUCapsQMPSchemaObjectGetType("variants",
|
baseName = virQEMUCapsQMPSchemaObjectGetType("variants",
|
||||||
*query + 1,
|
*query + 1,
|
||||||
"case", base);
|
"case", base);
|
||||||
else
|
else
|
||||||
basename = virQEMUCapsQMPSchemaObjectGetType("members",
|
baseName = virQEMUCapsQMPSchemaObjectGetType("members",
|
||||||
*query,
|
*query,
|
||||||
"name", base);
|
"name", base);
|
||||||
|
|
||||||
if (!basename)
|
if (!baseName)
|
||||||
return NULL;
|
return NULL;
|
||||||
} else if (STREQ(metatype, "command") ||
|
} else if (STREQ(metatype, "command") ||
|
||||||
STREQ(metatype, "event")) {
|
STREQ(metatype, "event")) {
|
||||||
if (!(basename = virJSONValueObjectGetString(base, *query)))
|
if (!(baseName = virJSONValueObjectGetString(base, *query)))
|
||||||
return NULL;
|
return NULL;
|
||||||
} else {
|
} else {
|
||||||
/* alternates, basic types and enums can't be entered */
|
/* alternates, basic types and enums can't be entered */
|
||||||
|
Loading…
Reference in New Issue
Block a user