[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 36/56] spapr/drc: Clean up local variable shadowing in prop_get_fd
From: |
Markus Armbruster |
Subject: |
[PULL 36/56] spapr/drc: Clean up local variable shadowing in prop_get_fdt() |
Date: |
Fri, 29 Sep 2023 10:50:33 +0200 |
From: Cédric Le Goater <clg@kaod.org>
Rename 'name' variable to avoid this warning :
../hw/ppc/spapr_drc.c: In function ‘prop_get_fdt’:
../hw/ppc/spapr_drc.c:344:21: warning: declaration of ‘name’ shadows a
parameter [-Wshadow=compatible-local]
344 | const char *name = NULL;
| ^~~~
../hw/ppc/spapr_drc.c:325:63: note: shadowed declaration is here
325 | static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
| ~~~~~~~~~~~~^~~~
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-9-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/ppc/spapr_drc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 843e318312..2b99d3b4b1 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -341,7 +341,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const
char *name,
fdt_depth = 0;
do {
- const char *name = NULL;
+ const char *dt_name = NULL;
const struct fdt_property *prop = NULL;
int prop_len = 0, name_len = 0;
uint32_t tag;
@@ -351,8 +351,8 @@ static void prop_get_fdt(Object *obj, Visitor *v, const
char *name,
switch (tag) {
case FDT_BEGIN_NODE:
fdt_depth++;
- name = fdt_get_name(fdt, fdt_offset, &name_len);
- if (!visit_start_struct(v, name, NULL, 0, errp)) {
+ dt_name = fdt_get_name(fdt, fdt_offset, &name_len);
+ if (!visit_start_struct(v, dt_name, NULL, 0, errp)) {
return;
}
break;
@@ -369,8 +369,8 @@ static void prop_get_fdt(Object *obj, Visitor *v, const
char *name,
case FDT_PROP: {
int i;
prop = fdt_get_property_by_offset(fdt, fdt_offset, &prop_len);
- name = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
- if (!visit_start_list(v, name, NULL, 0, errp)) {
+ dt_name = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
+ if (!visit_start_list(v, dt_name, NULL, 0, errp)) {
return;
}
for (i = 0; i < prop_len; i++) {
--
2.41.0
- [PULL 25/56] softmmu/memory: Clean up local variable shadowing, (continued)
- [PULL 25/56] softmmu/memory: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 26/56] softmmu/physmem: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 41/56] hw/arm/smmuv3.c: Avoid shadowing variable, Markus Armbruster, 2023/09/29
- [PULL 21/56] crypto/cipher-gnutls.c: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 29/56] hw/ppc: Clean up local variable shadowing in _FDT helper routine, Markus Armbruster, 2023/09/29
- [PULL 16/56] hw/arm/allwinner: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 20/56] net/eth: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 10/56] target/arm/hvf: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 39/56] hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd(), Markus Armbruster, 2023/09/29
- [PULL 33/56] spapr: Clean up local variable shadowing in spapr_get_fw_dev_path(), Markus Armbruster, 2023/09/29
- [PULL 36/56] spapr/drc: Clean up local variable shadowing in prop_get_fdt(),
Markus Armbruster <=
- [PULL 24/56] sysemu/device_tree: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 27/56] hw/core/machine: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 44/56] aspeed: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 43/56] aspeed/i2c: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 35/56] spapr/pci: Clean up local variable shadowing in spapr_phb_realize(), Markus Armbruster, 2023/09/29
- [PULL 37/56] test-throttle: don't shadow 'index' variable in do_test_accounting(), Markus Armbruster, 2023/09/29
- [PULL 46/56] aspeed/timer: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 56/56] disas/m68k: clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 55/56] hw/nvme: Clean up local variable shadowing in nvme_ns_init(), Markus Armbruster, 2023/09/29
- [PULL 50/56] qemu-nbd: changes towards enabling -Wshadow=local, Markus Armbruster, 2023/09/29