disas/m68k: clean up local variable shadowing

[PATCH] disas/m68k: clean up local variable shadowing

Posted by Laurent Vivier 7 months, 1 week ago

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

Re: [PATCH] disas/m68k: clean up local variable shadowing

Posted by Markus Armbruster 7 months ago

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!

Re: [PATCH] disas/m68k: clean up local variable shadowing

Posted by Thomas Huth 7 months, 1 week ago

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>