| Message ID | 20230918145850.241074-2-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | ppc: Clean up local variable shadowing | expand |
On 9/18/23 20:28, Cédric Le Goater wrote: > this fixes numerous warnings of this type : > > In file included from ../hw/ppc/spapr_pci.c:43: > ../hw/ppc/spapr_pci.c: In function ‘spapr_dt_phb’: > ../include/hw/ppc/fdt.h:18:13: warning: declaration of ‘ret’ shadows a previous local [-Wshadow=compatible-local] > 18 | int ret = (exp); \ > | ^~~ > ../hw/ppc/spapr_pci.c:2355:5: note: in expansion of macro ‘_FDT’ > 2355 | _FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname)); > | ^~~~ > ../hw/ppc/spapr_pci.c:2311:24: note: shadowed declaration is here > 2311 | int bus_off, i, j, ret; > | ^~~ > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com> > --- > include/hw/ppc/fdt.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/hw/ppc/fdt.h b/include/hw/ppc/fdt.h > index a8cd85069fe0..b56ac2a8cbb5 100644 > --- a/include/hw/ppc/fdt.h > +++ b/include/hw/ppc/fdt.h > @@ -15,10 +15,10 @@ > > #define _FDT(exp) \ > do { \ > - int ret = (exp); \ > - if (ret < 0) { \ > - error_report("error creating device tree: %s: %s", \ > - #exp, fdt_strerror(ret)); \ > + int _ret = (exp); \ > + if (_ret < 0) { \ > + error_report("error creating device tree: %s: %s", \ > + #exp, fdt_strerror(_ret)); \ > exit(1); \ > } \ > } while (0)
diff --git a/include/hw/ppc/fdt.h b/include/hw/ppc/fdt.h index a8cd85069fe0..b56ac2a8cbb5 100644 --- a/include/hw/ppc/fdt.h +++ b/include/hw/ppc/fdt.h @@ -15,10 +15,10 @@ #define _FDT(exp) \ do { \ - int ret = (exp); \ - if (ret < 0) { \ - error_report("error creating device tree: %s: %s", \ - #exp, fdt_strerror(ret)); \ + int _ret = (exp); \ + if (_ret < 0) { \ + error_report("error creating device tree: %s: %s", \ + #exp, fdt_strerror(_ret)); \ exit(1); \ } \ } while (0)
this fixes numerous warnings of this type : In file included from ../hw/ppc/spapr_pci.c:43: ../hw/ppc/spapr_pci.c: In function ‘spapr_dt_phb’: ../include/hw/ppc/fdt.h:18:13: warning: declaration of ‘ret’ shadows a previous local [-Wshadow=compatible-local] 18 | int ret = (exp); \ | ^~~ ../hw/ppc/spapr_pci.c:2355:5: note: in expansion of macro ‘_FDT’ 2355 | _FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname)); | ^~~~ ../hw/ppc/spapr_pci.c:2311:24: note: shadowed declaration is here 2311 | int bus_off, i, j, ret; | ^~~ Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/fdt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)