[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable
From: |
Eric Auger |
Subject: |
Re: [PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable |
Date: |
Tue, 26 Sep 2023 17:06:51 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 |
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 <peter.maydell@linaro.org>
> ---
> 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, &val)) {
> + device, &data)) {
> s->sys_cfgstat |= 2; /* error */
> } else {
> - s->sys_cfgdata = val;
> + s->sys_cfgdata = data;
> }
> }
> }
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Eric
- [PATCH 0/4] arm: fix some -Wshadow warnings, Peter Maydell, 2023/09/22
- [PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable, Peter Maydell, 2023/09/22
- [PATCH 4/4] hw/arm/smmuv3-internal.h: Don't use locals in statement macros, Peter Maydell, 2023/09/22
- [PATCH 3/4] hw/arm/smmuv3.c: Avoid shadowing variable, Peter Maydell, 2023/09/22
- [PATCH 1/4] hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd(), Peter Maydell, 2023/09/22
- Re: [PATCH 0/4] arm: fix some -Wshadow warnings, Markus Armbruster, 2023/09/29