]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu_capabilities: fix build with for old gcc
authorPavel Hrdina <phrdina@redhat.com>
Wed, 9 Nov 2016 17:40:14 +0000 (18:40 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Wed, 9 Nov 2016 17:43:39 +0000 (18:43 +0100)
../../src/qemu/qemu_capabilities.c:3757: error: declaration of
'basename' shadows a global declaration [-Wshadow]

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
src/qemu/qemu_capabilities.c

index ab1fc09439cfdfb19683f70c2bd0c323f0a0db44..5a3004de17ce1a3768899e434b0f64d39bf5e215 100644 (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 */