From ef382e84b759ee3f80383296bc23d1e6277f84ea Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Dec 2023 20:07:48 -0500 Subject: sim: common: fix -Wshadow=local warnings Rename shadowed vars with different types, and delete redundant decls. --- sim/common/sim-fpu.c | 4 ++-- sim/common/sim-options.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sim/common/sim-fpu.c b/sim/common/sim-fpu.c index 491a99b..4ee2672 100644 --- a/sim/common/sim-fpu.c +++ b/sim/common/sim-fpu.c @@ -413,9 +413,9 @@ unpack_fpu (sim_fpu *dst, uint64_t packed, int is_double) } else { - uint32_t val = pack_fpu (dst, 0); + uint32_t fval = pack_fpu (dst, 0); uint32_t org = packed; - ASSERT (val == org); + ASSERT (fval == org); } } } diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c index 9f23833..c695db6 100644 --- a/sim/common/sim-options.c +++ b/sim/common/sim-options.c @@ -496,7 +496,7 @@ standard_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, case OPTION_ENV_UNSET: { - int i, varlen; + int varlen; char **envp; if (STATE_PROG_ENVP (sd) == NULL) -- cgit v1.1