From 339af145c31094f8b0155e18bea386dabb9f435d Mon Sep 17 00:00:00 2001 From: vapier Date: Wed, 31 Mar 2010 05:39:38 +0000 Subject: [PATCH] sim: fix unused cpu_nr warnings The trace_option_handler() function only uses cpu_nr when the SIM_HAVE_ADDR_RANGE define is enabled. So move the decl down to where the code exists. Otherwise GCC warns: sim-trace.c: In function 'trace_option_handler': sim-trace.c:236: warning: unused variable 'cpu_nr' --- sim/common/ChangeLog | 5 +++++ sim/common/sim-trace.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 50418a74e9..64278e0cf6 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,10 @@ 2010-03-30 Mike Frysinger + * sim-trace.c (trace_option_handler): Move cpu_nr decl behind + the SIM_HAVE_ADDR_RANGE define. + +2010-03-30 Mike Frysinger + * sim-core.h (device_error): Add const to message, and add printf format attribute. diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c index 9bb24582cb..478cbfa27d 100644 --- a/sim/common/sim-trace.c +++ b/sim/common/sim-trace.c @@ -233,7 +233,6 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, char *arg, int is_command) { int n; - int cpu_nr; switch (opt) { @@ -353,6 +352,7 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, case OPTION_TRACE_RANGE : if (WITH_TRACE) { + int cpu_nr; char *chp = arg; unsigned long start,end; start = strtoul (chp, &chp, 0); -- 2.11.0