| Message ID | 20230904161235.84651-21-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | (few more) Steps towards enabling -Wshadow | expand |
Philippe Mathieu-Daudé <philmd@linaro.org> writes: > Fix: > > hw/mips/boston.c:472:5: error: declaration shadows a local variable [-Werror,-Wshadow] > qemu_fdt_setprop_cells(fdt, name, "reg", reg_base, reg_size); > ^ > include/sysemu/device_tree.h:129:13: note: expanded from macro 'qemu_fdt_setprop_cells' > int i; > ^ > hw/mips/boston.c:461:9: note: previous declaration is here > int i; > ^ > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/sysemu/device_tree.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h > index ca5339beae..8eab395934 100644 > --- a/include/sysemu/device_tree.h > +++ b/include/sysemu/device_tree.h > @@ -126,10 +126,8 @@ int qemu_fdt_add_path(void *fdt, const char *path); > #define qemu_fdt_setprop_cells(fdt, node_path, property, ...) \ > do { \ > uint32_t qdt_tmp[] = { __VA_ARGS__ }; \ > - int i; \ > - \ > - for (i = 0; i < ARRAY_SIZE(qdt_tmp); i++) { \ > - qdt_tmp[i] = cpu_to_be32(qdt_tmp[i]); \ > + for (unsigned i_ = 0; i_ < ARRAY_SIZE(qdt_tmp); i_++) { \ > + qdt_tmp[i_] = cpu_to_be32(qdt_tmp[i_]); \ > } \ > qemu_fdt_setprop(fdt, node_path, property, qdt_tmp, \ > sizeof(qdt_tmp)); \ You don't just rename the variable, but also adjust its type. When we're dealing with at a huge changeset like the tree-wide -Wshadow=local cleanup, I prefer to keep changes minimal to ease review as much as possible. But it's sunk cost now, so Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index ca5339beae..8eab395934 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -126,10 +126,8 @@ int qemu_fdt_add_path(void *fdt, const char *path); #define qemu_fdt_setprop_cells(fdt, node_path, property, ...) \ do { \ uint32_t qdt_tmp[] = { __VA_ARGS__ }; \ - int i; \ - \ - for (i = 0; i < ARRAY_SIZE(qdt_tmp); i++) { \ - qdt_tmp[i] = cpu_to_be32(qdt_tmp[i]); \ + for (unsigned i_ = 0; i_ < ARRAY_SIZE(qdt_tmp); i_++) { \ + qdt_tmp[i_] = cpu_to_be32(qdt_tmp[i_]); \ } \ qemu_fdt_setprop(fdt, node_path, property, qdt_tmp, \ sizeof(qdt_tmp)); \
Fix: hw/mips/boston.c:472:5: error: declaration shadows a local variable [-Werror,-Wshadow] qemu_fdt_setprop_cells(fdt, name, "reg", reg_base, reg_size); ^ include/sysemu/device_tree.h:129:13: note: expanded from macro 'qemu_fdt_setprop_cells' int i; ^ hw/mips/boston.c:461:9: note: previous declaration is here int i; ^ Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/sysemu/device_tree.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)