| Message ID | 20230925151029.461358-2-laurent@vivier.eu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-user: clean up local variable shadowing | expand |
On 25/09/2023 17.10, Laurent Vivier wrote: > Fix following warnings: > > .../linux-user/flatload.c: In function 'load_flt_binary': > .../linux-user/flatload.c:758:23: warning: declaration of 'p' shadows a previous local [-Wshadow=compatible-local] > 758 | abi_ulong p; > | ^ > ../../../Projects/qemu/linux-user/flatload.c:722:15: note: shadowed declaration is here > 722 | abi_ulong p; > | ^ > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- > linux-user/flatload.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 4331a11bf010..fdcc4610fa30 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -755,15 +755,15 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info) /* Update data segment pointers for all libraries */ for (i=0; i<MAX_SHARED_LIBS; i++) { if (libinfo[i].loaded) { - abi_ulong p; - p = libinfo[i].start_data; + abi_ulong seg; + seg = libinfo[i].start_data; for (j=0; j<MAX_SHARED_LIBS; j++) { - p -= 4; + seg -= 4; /* FIXME - handle put_user() failures */ if (put_user_ual(libinfo[j].loaded ? libinfo[j].start_data : UNLOADED_LIB, - p)) + seg)) return -EFAULT; } }
Fix following warnings: .../linux-user/flatload.c: In function 'load_flt_binary': .../linux-user/flatload.c:758:23: warning: declaration of 'p' shadows a previous local [-Wshadow=compatible-local] 758 | abi_ulong p; | ^ ../../../Projects/qemu/linux-user/flatload.c:722:15: note: shadowed declaration is here 722 | abi_ulong p; | ^ Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- linux-user/flatload.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)