* [PATCH] disas/m68k: clean up local variable shadowing
@ 2023-09-25 8:44 Laurent Vivier
2023-09-26 16:30 ` Thomas Huth
2023-09-29 6:58 ` Markus Armbruster
0 siblings, 2 replies; 3+ messages in thread
From: Laurent Vivier @ 2023-09-25 8:44 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Laurent Vivier
Fix following warnings
.../disas/m68k.c: In function ‘print_insn_arg’:
.../disas/m68k.c:1635:13: warning: declaration of ‘val’ shadows a previous local [-Wshadow=compatible-local]
1635 | int val = fetch_arg (buffer, place, 5, info);
| ^~~
.../disas/m68k.c:1093:7: note: shadowed declaration is here
1093 | int val = 0;
| ^~~
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
disas/m68k.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/disas/m68k.c b/disas/m68k.c
index aefaecfbd6cb..1f16e295ab41 100644
--- a/disas/m68k.c
+++ b/disas/m68k.c
@@ -1632,10 +1632,10 @@ print_insn_arg (const char *d,
case '2':
case '3':
{
- int val = fetch_arg (buffer, place, 5, info);
+ int reg = fetch_arg (buffer, place, 5, info);
const char *name = 0;
- switch (val)
+ switch (reg)
{
case 2: name = "%tt0"; break;
case 3: name = "%tt1"; break;
@@ -1655,12 +1655,12 @@ print_insn_arg (const char *d,
int break_reg = ((buffer[3] >> 2) & 7);
(*info->fprintf_func)
- (info->stream, val == 0x1c ? "%%bad%d" : "%%bac%d",
+ (info->stream, reg == 0x1c ? "%%bad%d" : "%%bac%d",
break_reg);
}
break;
default:
- (*info->fprintf_func) (info->stream, "<mmu register %d>", val);
+ (*info->fprintf_func) (info->stream, "<mmu register %d>", reg);
}
if (name)
(*info->fprintf_func) (info->stream, "%s", name);
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] disas/m68k: clean up local variable shadowing
2023-09-25 8:44 [PATCH] disas/m68k: clean up local variable shadowing Laurent Vivier
@ 2023-09-26 16:30 ` Thomas Huth
2023-09-29 6:58 ` Markus Armbruster
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Huth @ 2023-09-26 16:30 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel; +Cc: Markus Armbruster
On 25/09/2023 10.44, Laurent Vivier wrote:
> Fix following warnings
>
> .../disas/m68k.c: In function ‘print_insn_arg’:
> .../disas/m68k.c:1635:13: warning: declaration of ‘val’ shadows a previous local [-Wshadow=compatible-local]
> 1635 | int val = fetch_arg (buffer, place, 5, info);
> | ^~~
> .../disas/m68k.c:1093:7: note: shadowed declaration is here
> 1093 | int val = 0;
> | ^~~
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
> disas/m68k.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/disas/m68k.c b/disas/m68k.c
> index aefaecfbd6cb..1f16e295ab41 100644
> --- a/disas/m68k.c
> +++ b/disas/m68k.c
> @@ -1632,10 +1632,10 @@ print_insn_arg (const char *d,
> case '2':
> case '3':
> {
> - int val = fetch_arg (buffer, place, 5, info);
> + int reg = fetch_arg (buffer, place, 5, info);
> const char *name = 0;
>
> - switch (val)
> + switch (reg)
> {
> case 2: name = "%tt0"; break;
> case 3: name = "%tt1"; break;
> @@ -1655,12 +1655,12 @@ print_insn_arg (const char *d,
> int break_reg = ((buffer[3] >> 2) & 7);
>
> (*info->fprintf_func)
> - (info->stream, val == 0x1c ? "%%bad%d" : "%%bac%d",
> + (info->stream, reg == 0x1c ? "%%bad%d" : "%%bac%d",
> break_reg);
> }
> break;
> default:
> - (*info->fprintf_func) (info->stream, "<mmu register %d>", val);
> + (*info->fprintf_func) (info->stream, "<mmu register %d>", reg);
> }
> if (name)
> (*info->fprintf_func) (info->stream, "%s", name);
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] disas/m68k: clean up local variable shadowing
2023-09-25 8:44 [PATCH] disas/m68k: clean up local variable shadowing Laurent Vivier
2023-09-26 16:30 ` Thomas Huth
@ 2023-09-29 6:58 ` Markus Armbruster
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2023-09-29 6:58 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel
Laurent Vivier <laurent@vivier.eu> writes:
> Fix following warnings
>
> .../disas/m68k.c: In function ‘print_insn_arg’:
> .../disas/m68k.c:1635:13: warning: declaration of ‘val’ shadows a previous local [-Wshadow=compatible-local]
> 1635 | int val = fetch_arg (buffer, place, 5, info);
> | ^~~
> .../disas/m68k.c:1093:7: note: shadowed declaration is here
> 1093 | int val = 0;
> | ^~~
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Queued, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-29 6:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-25 8:44 [PATCH] disas/m68k: clean up local variable shadowing Laurent Vivier
2023-09-26 16:30 ` Thomas Huth
2023-09-29 6:58 ` Markus Armbruster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).