From dc41661593ac273875b8a1ccb8d0f98a345f5f46 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 30 Mar 2010 19:43:42 +0000 Subject: [PATCH] sim: convert old style function definitions GCC currently emits warnings like: nrun.c: In function 'usage': nrun.c:223: warning: old-style function definition --- sim/common/ChangeLog | 12 ++++++++++++ sim/common/nrun.c | 2 +- sim/common/sim-options.c | 11 +++-------- sim/common/sim-trace.c | 12 ++---------- sim/common/sim-utils.c | 10 +++------- 5 files changed, 21 insertions(+), 26 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 1b1bd3b1698..34f5dddae16 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,15 @@ +2010-03-30 Mike Frysinger + + * nrun.c (usage): Use void in definition. + * sim-options.c (dup_arg_p): Convert old-style function definition. + (sim_parse_args): Likewise. + (sim_print_help): Likewise. + * sim-trace.c (set_trace_option_mask): Likewise. + (set_trace_option): Likewise. + * sim-utils.c (sim_analyze_program): Likewise. + (sim_elapsed_time_get): Likewise. + (sim_elapsed_time_since): Likewise. + 2010-03-22 Mike Frysinger * sim/common/sim-options.c (enum): Remove SIM_HAVE_BIENDIAN ifdef. diff --git a/sim/common/nrun.c b/sim/common/nrun.c index aad1d8c9de4..e537849e70a 100644 --- a/sim/common/nrun.c +++ b/sim/common/nrun.c @@ -219,7 +219,7 @@ main (int argc, char **argv) } static void -usage () +usage (void) { fprintf (stderr, "Usage: %s [options] program [program args]\n", myname); fprintf (stderr, "Run `%s --help' for full list of options.\n", myname); diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c index 3369ca2cc95..571b29213bd 100644 --- a/sim/common/sim-options.c +++ b/sim/common/sim-options.c @@ -489,8 +489,7 @@ standard_install (SIM_DESC sd) #define ARG_HASH(a) ((256 * (unsigned char) a[0] + (unsigned char) a[1]) % ARG_HASH_SIZE) static int -dup_arg_p (arg) - char *arg; +dup_arg_p (char *arg) { int hash; static char **arg_table = NULL; @@ -520,9 +519,7 @@ dup_arg_p (arg) /* Called by sim_open to parse the arguments. */ SIM_RC -sim_parse_args (sd, argv) - SIM_DESC sd; - char **argv; +sim_parse_args (SIM_DESC sd, char **argv) { int c, i, argc, num_opts; char *p, *short_options; @@ -807,9 +804,7 @@ print_help (SIM_DESC sd, sim_cpu *cpu, const struct option_list *ol, int is_comm /* Print help messages for the options. */ void -sim_print_help (sd, is_command) - SIM_DESC sd; - int is_command; +sim_print_help (SIM_DESC sd, int is_command) { if (STATE_OPEN_KIND (sd) == SIM_OPEN_STANDALONE) sim_io_printf (sd, "Usage: %s [options] program [program args]\n", diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c index f59b3244146..9bb24582cbe 100644 --- a/sim/common/sim-trace.c +++ b/sim/common/sim-trace.c @@ -147,11 +147,7 @@ static const OPTION trace_options[] = /* Set/reset the trace options indicated in MASK. */ static SIM_RC -set_trace_option_mask (sd, name, mask, arg) - SIM_DESC sd; - const char *name; - int mask; - const char *arg; +set_trace_option_mask (SIM_DESC sd, const char *name, int mask, const char *arg) { int trace_nr; int cpu_nr; @@ -226,11 +222,7 @@ set_trace_option_mask (sd, name, mask, arg) /* Set one trace option based on its IDX value. */ static SIM_RC -set_trace_option (sd, name, idx, arg) - SIM_DESC sd; - const char *name; - int idx; - const char *arg; +set_trace_option (SIM_DESC sd, const char *name, int idx, const char *arg) { return set_trace_option_mask (sd, name, 1 << idx, arg); } diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c index 033be5c6b08..fb84eb3b124 100644 --- a/sim/common/sim-utils.c +++ b/sim/common/sim-utils.c @@ -218,10 +218,7 @@ sim_add_commas (char *buf, int sizeof_buf, unsigned long value) bfd open. */ SIM_RC -sim_analyze_program (sd, prog_name, prog_bfd) - SIM_DESC sd; - char *prog_name; - bfd *prog_bfd; +sim_analyze_program (SIM_DESC sd, char *prog_name, bfd *prog_bfd) { asection *s; SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); @@ -295,7 +292,7 @@ sim_analyze_program (sd, prog_name, prog_bfd) /* Called before sim_elapsed_time_since to get a reference point. */ SIM_ELAPSED_TIME -sim_elapsed_time_get () +sim_elapsed_time_get (void) { #ifdef HAVE_GETRUSAGE struct rusage mytime; @@ -315,8 +312,7 @@ sim_elapsed_time_get () The actual time may be cpu usage (preferred) or wall clock. */ unsigned long -sim_elapsed_time_since (start) - SIM_ELAPSED_TIME start; +sim_elapsed_time_since (SIM_ELAPSED_TIME start) { #ifdef HAVE_GETRUSAGE return sim_elapsed_time_get () - start; -- 2.30.2