sim: convert old style prototypes

Most of these prototypes have been killed off, but we have a few left
in the sim tree.  Clean them up so we can enable the -W flag for it.

6 files changed, 129 insertions, 197 deletions

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 2a5b9d8..89e37ca 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,75 @@
+2014-03-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* acinclude.m4 (build_warnings): Copy from gdb/configure.ac.
+	* callback.c (system): Delete unused prototype.
+	(os_init): Likewise.
+	(os_shutdown): Likewise.
+	(os_unlink): Likewise.
+	(os_time): Likewise.
+	(os_system): Likewise.
+	(os_rename): Likewise.
+	(os_write_stdout): Likewise.
+	(os_flush_stdout): Likewise.
+	(os_write_stderr): Likewise.
+	(os_flush_stderr): Likewise.
+	(os_write): Likewise.
+	(os_read_stdin): Likewise.
+	(os_read): Likewise.
+	(os_open): Likewise.
+	(os_lseek): Likewise.
+	(os_isatty): Likewise.
+	(os_get_errno): Likewise.
+	(os_close): Likewise.
+	(os_vprintf_filtered): Likewise.
+	(os_evprintf_filtered): Likewise.
+	(os_error): Likewise.
+	(fdmap): Likewise.
+	(fdbad): Likewise.
+	(wrap): Likewise.
+	(wrap): Change to new style prototype.
+	(fdbad): Likewise.
+	(fdmap): Likewise.
+	(os_close): Likewise.
+	(os_poll_quit): Likewise.
+	(os_get_errno): Likewise.
+	(os_isatty): Likewise.
+	(os_lseek): Likewise.
+	(os_open): Likewise.
+	(os_read): Likewise.
+	(os_read_stdin): Likewise.
+	(os_write): Likewise.
+	(os_write_stdout): Likewise.
+	(os_flush_stdout): Likewise.
+	(os_write_stderr): Likewise.
+	(os_flush_stderr): Likewise.
+	(os_rename): Likewise.
+	(os_system): Likewise.
+	(os_time): Likewise.
+	(os_unlink): Likewise.
+	(os_stat): Likewise.
+	(os_fstat): Likewise.
+	(os_lstat): Likewise.
+	(os_ftruncate): Likewise.
+	(os_truncate): Likewise.
+	(os_pipe): Likewise.
+	(os_pipe_empty): Likewise.
+	(os_pipe_nonempty): Likewise.
+	(os_shutdown): Likewise.
+	(os_init): Likewise.
+	(cb_read_target_syscall_maps): Likewise.
+	(cb_target_to_host_syscall): Likewise.
+	(cb_host_to_target_errno): Likewise.
+	(cb_target_to_host_open): Likewise.
+	(cb_store_target_endian): Likewise.
+	(cb_host_to_target_stat): Likewise.
+	* sim-hload.c (sim_load): Change to new style prototype.
+	* sim-load.c (sim_load_file): Change to new style prototype.
+	(report_transfer_performance): Likewise.
+	(xprintf_bfd_vma): Likewise.
+	* syscall.c (cb_get_string): Change to new style prototype.
+	(get_path): Likewise.
+	(cb_syscall): Likewise.
+
 2013-10-15  Hans-Peter Nilsson  <hp@axis.com>
 
 	* create-version.sh: Align parameters to match those of
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 6119b33..f96ec35 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -855,15 +855,12 @@ if test "${ERROR_ON_WARNING}" = yes ; then
      true
 fi
 
-# The entries after -Wno-pointer-sign are disabled warnings which may
-# be enabled in the future, which can not currently be used to build
-# GDB.
-# NOTE: If you change this list, remember to update
-# gdb/doc/gdbint.texinfo.
 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
--Wno-pointer-sign \
+-Wpointer-sign \
 -Wno-unused -Wunused-value -Wunused-function \
--Wno-switch -Wno-char-subscripts -Wmissing-prototypes"
+-Wno-switch -Wno-char-subscripts -Wmissing-prototypes
+-Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type \
+-Wold-style-declaration -Wold-style-definition"
 
 # Enable -Wno-format by default when using gcc on mingw since many
 # GCC versions complain about %I64.
diff --git a/sim/common/callback.c b/sim/common/callback.c
index d7a046c..37d42f8 100644
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -69,43 +69,10 @@ extern CB_TARGET_DEFS_MAP cb_init_syscall_map[];
 extern CB_TARGET_DEFS_MAP cb_init_errno_map[];
 extern CB_TARGET_DEFS_MAP cb_init_open_map[];
 
-extern int system (const char *);
-
-static int os_init (host_callback *);
-static int os_shutdown (host_callback *);
-static int os_unlink (host_callback *, const char *);
-static long os_time (host_callback *, long *);
-static int os_system (host_callback *, const char *);
-static int os_rename (host_callback *, const char *, const char *);
-static int os_write_stdout (host_callback *, const char *, int);
-static void os_flush_stdout (host_callback *);
-static int os_write_stderr (host_callback *, const char *, int);
-static void os_flush_stderr (host_callback *);
-static int os_write (host_callback *, int, const char *, int);
-static int os_read_stdin (host_callback *, char *, int);
-static int os_read (host_callback *, int, char *, int);
-static int os_open (host_callback *, const char *, int);
-static int os_lseek (host_callback *, int, long, int);
-static int os_isatty (host_callback *, int);
-static int os_get_errno (host_callback *);
-static int os_close (host_callback *, int);
-static void os_vprintf_filtered (host_callback *, const char *, va_list);
-static void os_evprintf_filtered (host_callback *, const char *, va_list);
-static void os_error (host_callback *, const char *, ...)
-#ifdef __GNUC__
-  __attribute__ ((__noreturn__))
-#endif
-  ;
-static int fdmap (host_callback *, int);
-static int fdbad (host_callback *, int);
-static int wrap (host_callback *, int);
-
 /* Set the callback copy of errno from what we see now.  */
 
 static int
-wrap (p, val)
-     host_callback *p;
-     int val;
+wrap (host_callback *p, int val)
 {
   p->last_errno = errno;
   return val;
@@ -115,9 +82,7 @@ wrap (p, val)
    and set errno. */
 
 static int
-fdbad (p, fd)
-     host_callback *p;
-     int fd;
+fdbad (host_callback *p, int fd)
 {
   if (fd < 0 || fd > MAX_CALLBACK_FDS || p->fd_buddy[fd] < 0)
     {
@@ -128,17 +93,13 @@ fdbad (p, fd)
 }
 
 static int
-fdmap (p, fd)
-     host_callback *p;
-     int fd;
+fdmap (host_callback *p, int fd)
 {
   return p->fdmap[fd];
 }
 
 static int
-os_close (p, fd)
-     host_callback *p;
-     int fd;
+os_close (host_callback *p, int fd)
 {
   int result;
   int i, next;
@@ -206,8 +167,7 @@ os_close (p, fd)
 
 #if defined(__GO32__) || defined (_MSC_VER)
 static int
-os_poll_quit (p)
-     host_callback *p;
+os_poll_quit (host_callback *p)
 {
 #if defined(__GO32__)
   int kbhit ();
@@ -244,17 +204,14 @@ os_poll_quit (p)
 #endif /* defined(__GO32__) || defined(_MSC_VER) */
 
 static int
-os_get_errno (p)
-     host_callback *p;
+os_get_errno (host_callback *p)
 {
   return cb_host_to_target_errno (p, p->last_errno);
 }
 
 
 static int
-os_isatty (p, fd)
-     host_callback *p;
-     int fd;
+os_isatty (host_callback *p, int fd)
 {
   int result;
 
@@ -267,11 +224,7 @@ os_isatty (p, fd)
 }
 
 static int
-os_lseek (p, fd, off, way)
-     host_callback *p;
-     int fd;
-     long off;
-     int way;
+os_lseek (host_callback *p, int fd, long off, int way)
 {
   int result;
 
@@ -283,10 +236,7 @@ os_lseek (p, fd, off, way)
 }
 
 static int
-os_open (p, name, flags)
-     host_callback *p;
-     const char *name;
-     int flags;
+os_open (host_callback *p, const char *name, int flags)
 {
   int i;
   for (i = 0; i < MAX_CALLBACK_FDS; i++)
@@ -309,11 +259,7 @@ os_open (p, name, flags)
 }
 
 static int
-os_read (p, fd, buf, len)
-     host_callback *p;
-     int fd;
-     char *buf;
-     int len;
+os_read (host_callback *p, int fd, char *buf, int len)
 {
   int result;
 
@@ -366,20 +312,13 @@ os_read (p, fd, buf, len)
 }
 
 static int
-os_read_stdin (p, buf, len)
-     host_callback *p;
-     char *buf;
-     int len;
+os_read_stdin (host_callback *p, char *buf, int len)
 {
   return wrap (p, read (0, buf, len));
 }
 
 static int
-os_write (p, fd, buf, len)
-     host_callback *p;
-     int fd;
-     const char *buf;
-     int len;
+os_write (host_callback *p, int fd, const char *buf, int len)
 {
   int result;
   int real_fd;
@@ -447,77 +386,57 @@ os_write (p, fd, buf, len)
 }
 
 static int
-os_write_stdout (p, buf, len)
-     host_callback *p ATTRIBUTE_UNUSED;
-     const char *buf;
-     int len;
+os_write_stdout (host_callback *p ATTRIBUTE_UNUSED, const char *buf, int len)
 {
   return fwrite (buf, 1, len, stdout);
 }
 
 static void
-os_flush_stdout (p)
-     host_callback *p ATTRIBUTE_UNUSED;
+os_flush_stdout (host_callback *p ATTRIBUTE_UNUSED)
 {
   fflush (stdout);
 }
 
 static int
-os_write_stderr (p, buf, len)
-     host_callback *p ATTRIBUTE_UNUSED;
-     const char *buf;
-     int len;
+os_write_stderr (host_callback *p ATTRIBUTE_UNUSED, const char *buf, int len)
 {
   return fwrite (buf, 1, len, stderr);
 }
 
 static void
-os_flush_stderr (p)
-     host_callback *p ATTRIBUTE_UNUSED;
+os_flush_stderr (host_callback *p ATTRIBUTE_UNUSED)
 {
   fflush (stderr);
 }
 
 static int
-os_rename (p, f1, f2)
-     host_callback *p;
-     const char *f1;
-     const char *f2;
+os_rename (host_callback *p, const char *f1, const char *f2)
 {
   return wrap (p, rename (f1, f2));
 }
 
 
 static int
-os_system (p, s)
-     host_callback *p;
-     const char *s;
+os_system (host_callback *p, const char *s)
 {
   return wrap (p, system (s));
 }
 
 static long
-os_time (p, t)
-     host_callback *p;
-     long *t;
+os_time (host_callback *p, long *t)
 {
   return wrap (p, time (t));
 }
 
 
 static int
-os_unlink (p, f1)
-     host_callback *p;
-     const char *f1;
+os_unlink (host_callback *p, const char *f1)
 {
   return wrap (p, unlink (f1));
 }
 
 static int
-os_stat (p, file, buf)
-     host_callback *p;
-     const char *file;
-     struct stat *buf;
+os_stat (host_callback *p, const char *file, struct stat *buf)
 {
   /* ??? There is an issue of when to translate to the target layout.
      One could do that inside this function, or one could have the
@@ -527,10 +446,7 @@ os_stat (p, file, buf)
 }
 
 static int
-os_fstat (p, fd, buf)
-     host_callback *p;
-     int fd;
-     struct stat *buf;
+os_fstat (host_callback *p, int fd, struct stat *buf)
 {
   if (fdbad (p, fd))
     return -1;
@@ -574,10 +490,7 @@ os_fstat (p, fd, buf)
 }
 
 static int
-os_lstat (p, file, buf)
-     host_callback *p;
-     const char *file;
-     struct stat *buf;
+os_lstat (host_callback *p, const char *file, struct stat *buf)
 {
   /* NOTE: hpn/2004-12-12: Same issue here as with os_fstat.  */
 #ifdef HAVE_LSTAT
@@ -588,10 +501,7 @@ os_lstat (p, file, buf)
 }
 
 static int
-os_ftruncate (p, fd, len)
-     host_callback *p;
-     int fd;
-     long len;
+os_ftruncate (host_callback *p, int fd, long len)
 {
   int result;
 
@@ -613,10 +523,7 @@ os_ftruncate (p, fd, len)
 }
 
 static int
-os_truncate (p, file, len)
-     host_callback *p;
-     const char *file;
-     long len;
+os_truncate (host_callback *p, const char *file, long len)
 {
 #ifdef HAVE_TRUNCATE
   return wrap (p, truncate (file, len));
@@ -627,9 +534,7 @@ os_truncate (p, file, len)
 }
 
 static int
-os_pipe (p, filedes)
-     host_callback *p;
-     int *filedes;
+os_pipe (host_callback *p, int *filedes)
 {
   int i;
 
@@ -669,10 +574,7 @@ os_pipe (p, filedes)
    now empty (so the writer should leave its waiting state).  */
 
 static void
-os_pipe_empty (p, reader, writer)
-     host_callback *p;
-     int reader;
-     int writer;
+os_pipe_empty (host_callback *p, int reader, int writer)
 {
 }
 
@@ -680,16 +582,12 @@ os_pipe_empty (p, reader, writer)
    non-empty (so the writer should wait).  */
 
 static void
-os_pipe_nonempty (p, reader, writer)
-     host_callback *p;
-     int reader;
-     int writer;
+os_pipe_nonempty (host_callback *p, int reader, int writer)
 {
 }
 
 static int
-os_shutdown (p)
-     host_callback *p;
+os_shutdown (host_callback *p)
 {
   int i, next, j;
   for (i = 0; i < MAX_CALLBACK_FDS; i++)
@@ -729,8 +627,7 @@ os_shutdown (p)
 }
 
 static int
-os_init (p)
-     host_callback *p;
+os_init (host_callback *p)
 {
   int i;
 
@@ -778,6 +675,9 @@ os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_
 }
 
 /* VARARGS */
+#ifdef __GNUC__
+__attribute__ ((__noreturn__))
+#endif
 static void
 os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
 {
@@ -861,9 +761,7 @@ host_callback default_callback =
    If an error occurs, the existing mapping is not changed.  */
 
 CB_RC
-cb_read_target_syscall_maps (cb, file)
-     host_callback *cb;
-     const char *file;
+cb_read_target_syscall_maps (host_callback *cb, const char *file)
 {
   CB_TARGET_DEFS_MAP *syscall_map, *errno_map, *open_map, *signal_map;
   const char *stat_map;
@@ -903,9 +801,7 @@ cb_read_target_syscall_maps (cb, file)
    ??? Perhaps this should be renamed to ..._canon_syscall.  */
 
 int
-cb_target_to_host_syscall (cb, target_val)
-     host_callback *cb;
-     int target_val;
+cb_target_to_host_syscall (host_callback *cb, int target_val)
 {
   CB_TARGET_DEFS_MAP *m;
 
@@ -923,9 +819,7 @@ cb_target_to_host_syscall (cb, target_val)
 /* Translate the host's version of errno to the target's.  */
 
 int
-cb_host_to_target_errno (cb, host_val)
-     host_callback *cb;
-     int host_val;
+cb_host_to_target_errno (host_callback *cb, int host_val)
 {
   CB_TARGET_DEFS_MAP *m;
 
@@ -945,9 +839,7 @@ cb_host_to_target_errno (cb, host_val)
    to machine generate this function.  */
 
 int
-cb_target_to_host_open (cb, target_val)
-     host_callback *cb;
-     int target_val;
+cb_target_to_host_open (host_callback *cb, int target_val)
 {
   int host_val = 0;
   CB_TARGET_DEFS_MAP *m;
@@ -981,14 +873,12 @@ cb_target_to_host_open (cb, target_val)
 }
 
 /* Utility for e.g. cb_host_to_target_stat to store values in the target's
-   stat struct.  */
+   stat struct.
+
+   ??? The "val" must be as big as target word size.  */
 
 void
-cb_store_target_endian (cb, p, size, val)
-     host_callback *cb;
-     char *p;
-     int size;
-     long val; /* ??? must be as big as target word size */
+cb_store_target_endian (host_callback *cb, char *p, int size, long val)
 {
   if (cb->target_endian == BFD_ENDIAN_BIG)
     {
@@ -1017,10 +907,7 @@ cb_store_target_endian (cb, p, size, val)
    or zero if an error occurred during the translation.  */
 
 int
-cb_host_to_target_stat (cb, hs, ts)
-     host_callback *cb;
-     const struct stat *hs;
-     PTR ts;
+cb_host_to_target_stat (host_callback *cb, const struct stat *hs, PTR ts)
 {
   const char *m = cb->stat_map;
   char *p;
diff --git a/sim/common/sim-hload.c b/sim/common/sim-hload.c
index 9466770..66a981b 100644
--- a/sim/common/sim-hload.c
+++ b/sim/common/sim-hload.c
@@ -27,11 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
    modeling a hardware platform. */
 
 SIM_RC
-sim_load (sd, prog_name, prog_bfd, from_tty)
-     SIM_DESC sd;
-     char *prog_name;
-     struct bfd *prog_bfd;
-     int from_tty;
+sim_load (SIM_DESC sd, char *prog_name, struct bfd *prog_bfd, int from_tty)
 {
   bfd *result_bfd;
 
diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index 48c0a93..f077065 100644
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -56,15 +56,9 @@ static void xprintf_bfd_vma (host_callback *, bfd_vma);
 
 
 bfd *
-sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
-     SIM_DESC sd;
-     const char *myname;
-     host_callback *callback;
-     char *prog;
-     bfd *prog_bfd;
-     int verbose_p;
-     int lma_p;
-     sim_write_fn do_write;
+sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback,
+	       char *prog, bfd *prog_bfd, int verbose_p, int lma_p,
+	       sim_write_fn do_write)
 {
   asection *s;
   /* Record separately as we don't want to close PROG_BFD if it was passed.  */
@@ -195,10 +189,8 @@ eprintf (host_callback *callback, const char *fmt, ...)
 /* Report how fast the transfer went. */
 
 static void
-report_transfer_performance (callback, data_count, start_time, end_time)
-     host_callback *callback;
-     unsigned long data_count;
-     time_t start_time, end_time;
+report_transfer_performance (host_callback *callback, unsigned long data_count,
+			     time_t start_time, time_t end_time)
 {
   xprintf (callback, "Transfer rate: ");
   if (end_time != start_time)
@@ -213,9 +205,7 @@ report_transfer_performance (callback, data_count, start_time, end_time)
    This is intended to handle the vagaries of 32 vs 64 bits, etc.  */
 
 static void
-xprintf_bfd_vma (callback, vma)
-     host_callback *callback;
-     bfd_vma vma;
+xprintf_bfd_vma (host_callback *callback, bfd_vma vma)
 {
   /* FIXME: for now */
   xprintf (callback, "0x%lx", (unsigned long) vma);
diff --git a/sim/common/syscall.c b/sim/common/syscall.c
index 10d58aa..397cd80 100644
--- a/sim/common/syscall.c
+++ b/sim/common/syscall.c
@@ -76,12 +76,8 @@ char *simulator_sysroot = "";
    The result is 0 for success or a host errno value.  */
 
 int
-cb_get_string (cb, sc, buf, buflen, addr)
-     host_callback *cb;
-     CB_SYSCALL *sc;
-     char *buf;
-     int buflen;
-     TADDR addr;
+cb_get_string (host_callback *cb, CB_SYSCALL *sc, char *buf, int buflen,
+	       TADDR addr)
 {
   char *p, *pend;
 
@@ -110,11 +106,7 @@ cb_get_string (cb, sc, buf, buflen, addr)
    If an error occurs, no buffer is left malloc'd.  */
 
 static int
-get_path (cb, sc, addr, bufp)
-     host_callback *cb;
-     CB_SYSCALL *sc;
-     TADDR addr;
-     char **bufp;
+get_path (host_callback *cb, CB_SYSCALL *sc, TADDR addr, char **bufp)
 {
   char *buf = xmalloc (MAX_PATH_LEN);
   int result;
@@ -147,9 +139,7 @@ get_path (cb, sc, addr, bufp)
 /* Perform a system call on behalf of the target.  */
 
 CB_RC
-cb_syscall (cb, sc)
-     host_callback *cb;
-     CB_SYSCALL *sc;
+cb_syscall (host_callback *cb, CB_SYSCALL *sc)
 {
   TWORD result = 0, errcode = 0;