X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-load.c;h=701b60e8714e806ae892521985c772be6859af86;hb=128e85e3ab36b8e30f6612fb50de3cbb4ede6824;hp=2e2b804bf63b0edbeef8bff5d1beba9abb337d58;hpb=bdca5ee4bcd2fce04de6c9eabdbef8d960298e02;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index 2e2b804bf6..701b60e871 100644
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -1,5 +1,5 @@
 /* Utility to load a file into the simulator.
-   Copyright (C) 1997-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-2016 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
    to suggest that they shouldn't :-)].  */
 
 #ifdef HAVE_CONFIG_H
-#include "cconfig.h"
+#include "config.h"
 #endif
 #include "ansidecl.h"
 #include <stdio.h> /* for NULL */
@@ -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,
+	       const 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.  */
@@ -173,7 +167,7 @@ xprintf (host_callback *callback, const char *fmt, ...)
 {
   va_list ap;
 
-  VA_START (ap, fmt);
+  va_start (ap, fmt);
 
   (*callback->vprintf_filtered) (callback, fmt, ap);
 
@@ -185,7 +179,7 @@ eprintf (host_callback *callback, const char *fmt, ...)
 {
   va_list ap;
 
-  VA_START (ap, fmt);
+  va_start (ap, fmt);
 
   (*callback->evprintf_filtered) (callback, fmt, ap);
 
@@ -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);