Re: [PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable

[Eric Auger]

On 9/22/23 17:29, Peter Maydell wrote:
> Avoid shadowing a local variable in arm_sysctl_write():
>
> ../../hw/misc/arm_sysctl.c: In function ‘arm_sysctl_write’:
> ../../hw/misc/arm_sysctl.c:537:26: warning: declaration of ‘val’ shadows a 
> parameter [-Wshadow=local]
>   537 | uint32_t val;
>   |  ^~~
> ../../hw/misc/arm_sysctl.c:388:39: note: shadowed declaration is here
>   388 |  uint64_t val, unsigned size)
>   |  ~^~~
>
> Signed-off-by: Peter Maydell 
> ---
>  hw/misc/arm_sysctl.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
> index 42d46938543..3e4f4b05244 100644
> --- a/hw/misc/arm_sysctl.c
> +++ b/hw/misc/arm_sysctl.c
> @@ -534,12 +534,12 @@ static void arm_sysctl_write(void *opaque, hwaddr 
> offset,
>  s->sys_cfgstat |= 2;/* error */
>  }
>  } else {
> -uint32_t val;
> +uint32_t data;
>  if (!vexpress_cfgctrl_read(s, dcc, function, site, position,
> -   device, )) {
> +   device, )) {
>  s->sys_cfgstat |= 2;/* error */
>  } else {
> -s->sys_cfgdata = val;
> +s->sys_cfgdata = data;
>  }
>  }
>  }
Reviewed-by: Eric Auger 

Eric

Re: [PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable

[Philippe Mathieu-Daudé]

On 22/9/23 17:29, Peter Maydell wrote:

Avoid shadowing a local variable in arm_sysctl_write():

../../hw/misc/arm_sysctl.c: In function ‘arm_sysctl_write’:
../../hw/misc/arm_sysctl.c:537:26: warning: declaration of ‘val’ shadows a 
parameter [-Wshadow=local]
   537 | uint32_t val;
   |  ^~~
../../hw/misc/arm_sysctl.c:388:39: note: shadowed declaration is here
   388 |  uint64_t val, unsigned size)
   |  ~^~~

Signed-off-by: Peter Maydell 
---
  hw/misc/arm_sysctl.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé 

[PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable

[Peter Maydell]

Avoid shadowing a local variable in arm_sysctl_write():

../../hw/misc/arm_sysctl.c: In function ‘arm_sysctl_write’:
../../hw/misc/arm_sysctl.c:537:26: warning: declaration of ‘val’ shadows a 
parameter [-Wshadow=local]
  537 | uint32_t val;
  |  ^~~
../../hw/misc/arm_sysctl.c:388:39: note: shadowed declaration is here
  388 |  uint64_t val, unsigned size)
  |  ~^~~

Signed-off-by: Peter Maydell 
---
 hw/misc/arm_sysctl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 42d46938543..3e4f4b05244 100644
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -534,12 +534,12 @@ static void arm_sysctl_write(void *opaque, hwaddr offset,
 s->sys_cfgstat |= 2;/* error */
 }
 } else {
-uint32_t val;
+uint32_t data;
 if (!vexpress_cfgctrl_read(s, dcc, function, site, position,
-   device, )) {
+   device, )) {
 s->sys_cfgstat |= 2;/* error */
 } else {
-s->sys_cfgdata = val;
+s->sys_cfgdata = data;
 }
 }
 }
-- 
2.34.1