For review: delete legacy varargs code

[Andrew Cagney <ac131313@cygnus.com>]

So,

Are we really using ISO-C?  Any objections?

	Andrew

Fri Aug  6 19:26:03 1999  Andrew Cagney  <cagney@b1.cygnus.com>

	* defs.h: Delete #if ANSI_PROTOTYPES code, GDB assumes ISO-C.
	* remote-rdp.c (send_rdp), remote-os9k.c (printf_monitor),
 	remote-mips.c: (mips_error), remote-array.c: (printf_monitor,
 	debuglogs), complaints.c (complain), monitor.c:
 	(monitor_printf_noecho, monitor_printf), language.c (type_error,
 	range_error), remote-st.c: (printf_stdebug), remote-sim.c
 	(gdb_os_printf_filtered, gdb_os_vprintf_filtered,
 	gdb_os_evprintf_filtered, gdb_os_error), serial.c (serial_printf),
 	utils.c (warning, error, fatal, fatal_dump_core, (query,
 	fprintf_filtered, fprintf_unfiltered, fprintfi_filtered,
 	printf_filtered, printf_unfiltered, printfi_filtered): Delete
 	legacy #ifndef ANSI_PROTOTYPES varargs code.

	* defs.h: Don't #include <varargs.h>.
	* remote-rdp.c, remote-os9k.c, remote-mips.c, remote-array.c,
 	monitor.c, remote-st.c: Don't include <varargs.h> or <stdarg.h>.
Index: complaints.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/complaints.c,v
retrieving revision 2.10
diff -p -r2.10 complaints.c
*** complaints.c	1999/07/07 23:51:03	2.10
--- complaints.c	1999/08/06 09:52:32
*************** extern int info_verbose;
*** 60,83 ****
  /* Print a complaint about the input symbols, and link the complaint block
     into a chain for later handling.  */
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  complain (struct complaint *complaint,...)
- #else
- complain (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, complaint);
- #else
-   struct complaint *complaint;
- 
-   va_start (args);
-   complaint = va_arg (args, struct complaint *);
- #endif
  
    complaint->counter++;
    if (complaint->next == NULL)
--- 60,70 ----
Index: defs.h
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/defs.h,v
retrieving revision 1.240
diff -p -r1.240 defs.h
*** defs.h	1999/07/11 16:26:21	1.240
--- defs.h	1999/08/06 09:52:34
***************
*** 48,58 ****
  
  #include "ansidecl.h"
  
! #ifdef ANSI_PROTOTYPES
! #include <stdarg.h>
! #else
! #include <varargs.h>
! #endif
  
  #include "libiberty.h"
  
--- 48,54 ----
  
  #include "ansidecl.h"
  
! #include <stdarg.h> /* for va_list */
  
  #include "libiberty.h"
  
*************** struct cleanup
*** 226,232 ****
  #endif
  
  #ifndef ATTR_FORMAT
! # if defined(__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 4 && defined (__ANSI_PROTOTYPES)
  #  define ATTR_FORMAT(type, x, y) __attribute__ ((format(type, x, y)))
  # else
  #  define ATTR_FORMAT(type, x, y) /* nothing */
--- 222,228 ----
  #endif
  
  #ifndef ATTR_FORMAT
! # if defined(__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 4
  #  define ATTR_FORMAT(type, x, y) __attribute__ ((format(type, x, y)))
  # else
  #  define ATTR_FORMAT(type, x, y) /* nothing */
Index: language.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/language.c,v
retrieving revision 2.66
diff -p -r2.66 language.c
*** language.c	1999/07/07 23:51:38	2.66
--- language.c	1999/08/06 09:52:37
*************** op_error (fmt, op, fatal)
*** 1076,1096 ****
     by the value of warning_pre_print and we do not return to the top level. */
  
  void
- #ifdef ANSI_PROTOTYPES
  type_error (char *string,...)
- #else
- type_error (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, string);
- #else
-   char *string;
-   va_start (args);
-   string = va_arg (args, char *);
- #endif
  
    if (type_check == type_check_warn)
      fprintf_filtered (gdb_stderr, warning_pre_print);
--- 1076,1085 ----
*************** type_error (va_alist)
*** 1105,1125 ****
  }
  
  void
- #ifdef ANSI_PROTOTYPES
  range_error (char *string,...)
- #else
- range_error (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, string);
- #else
-   char *string;
-   va_start (args);
-   string = va_arg (args, char *);
- #endif
  
    if (range_check == range_check_warn)
      fprintf_filtered (gdb_stderr, warning_pre_print);
--- 1094,1103 ----
Index: monitor.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/monitor.c,v
retrieving revision 1.101
diff -p -r1.101 monitor.c
*** monitor.c	1999/08/05 08:44:59	1.101
--- monitor.c	1999/08/06 09:52:42
***************
*** 42,52 ****
  #include "gdbcore.h"
  #include "target.h"
  #include "wait.h"
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
  #include <signal.h>
  #include <ctype.h>
  #include "gdb_string.h"
--- 42,47 ----
*************** monitor_vsprintf (sndbuf, pattern, args)
*** 320,343 ****
     Works just like printf.  */
  
  void
- #ifdef ANSI_PROTOTYPES
  monitor_printf_noecho (char *pattern,...)
- #else
- monitor_printf_noecho (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    char sndbuf[2000];
    int len;
  
- #if ANSI_PROTOTYPES
    va_start (args, pattern);
- #else
-   char *pattern;
-   va_start (args);
-   pattern = va_arg (args, char *);
- #endif
  
    monitor_vsprintf (sndbuf, pattern, args);
  
--- 315,327 ----
*************** monitor_printf_noecho (va_alist)
*** 364,387 ****
     printf.  */
  
  void
- #ifdef ANSI_PROTOTYPES
  monitor_printf (char *pattern,...)
- #else
- monitor_printf (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    char sndbuf[2000];
    int len;
  
- #ifdef ANSI_PROTOTYPES
    va_start (args, pattern);
- #else
-   char *pattern;
-   va_start (args);
-   pattern = va_arg (args, char *);
- #endif
  
    monitor_vsprintf (sndbuf, pattern, args);
  
--- 348,360 ----
Index: remote-array.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/remote-array.c,v
retrieving revision 2.24
diff -p -r2.24 remote-array.c
*** remote-array.c	1999/07/07 23:51:41	2.24
--- remote-array.c	1999/08/06 09:52:45
***************
*** 29,39 ****
  #include "gdbcore.h"
  #include "target.h"
  #include "wait.h"
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
  #include <ctype.h>
  #include <signal.h>
  #include <sys/types.h>
--- 29,34 ----
*************** Specify the serial device it is connecte
*** 200,223 ****
   * printf_monitor -- send data to monitor.  Works just like printf.
   */
  static void
- #ifdef ANSI_PROTOTYPES
  printf_monitor (char *pattern,...)
- #else
- printf_monitor (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    char buf[PBUFSIZ];
    int i;
  
- #ifdef ANSI_PROTOTYPES
    va_start (args, pattern);
- #else
-   char *pattern;
-   va_start (args);
-   pattern = va_arg (args, char *);
- #endif
  
    vsprintf (buf, pattern, args);
  
--- 195,207 ----
*************** write_monitor (data, len)
*** 251,262 ****
   *      to be formatted and printed. A CR is added after each string is printed.
   */
  static void
- #ifdef ANSI_PROTOTYPES
  debuglogs (int level, char *pattern,...)
- #else
- debuglogs (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    char *p;
--- 235,241 ----
*************** debuglogs (va_alist)
*** 264,278 ****
    char newbuf[PBUFSIZ];
    int i;
  
- #ifdef ANSI_PROTOTYPES
    va_start (args, pattern);
- #else
-   char *pattern;
-   int level;
-   va_start (args);
-   level = va_arg (args, int);	/* get the debug level */
-   pattern = va_arg (args, char *);	/* get the printf style pattern */
- #endif
  
    if ((level < 0) || (level > 100))
      {
--- 243,249 ----
Index: remote-mips.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/remote-mips.c,v
retrieving revision 2.94
diff -p -r2.94 remote-mips.c
*** remote-mips.c	1999/07/07 23:51:42	2.94
--- remote-mips.c	1999/08/06 09:52:53
***************
*** 35,45 ****
  #include <signal.h>
  #include <sys/types.h>
  #include <sys/stat.h>
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
  
  /* Microsoft C's stat.h doesn't define all the POSIX file modes.  */
  #ifndef S_IROTH
--- 35,40 ----
*************** close_ports ()
*** 487,508 ****
     inconsistent state.  */
  
  static NORETURN void
- #ifdef ANSI_PROTOTYPES
  mips_error (char *string,...)
- #else
- mips_error (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
  
- #ifdef ANSI_PROTOTYPES
    va_start (args, string);
- #else
-   char *string;
-   va_start (args);
-   string = va_arg (args, char *);
- #endif
  
    target_terminal_ours ();
    wrap_here ("");		/* Force out any buffered output */
--- 482,492 ----
Index: remote-os9k.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/remote-os9k.c,v
retrieving revision 2.26
diff -p -r2.26 remote-os9k.c
*** remote-os9k.c	1999/07/07 23:51:46	2.26
--- remote-os9k.c	1999/08/06 09:52:56
***************
*** 41,51 ****
  #include "gdbcore.h"
  #include "target.h"
  #include "wait.h"
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
  #include <signal.h>
  #include "gdb_string.h"
  #include <sys/types.h>
--- 41,46 ----
*************** static char readbuf[16];
*** 93,116 ****
  
  /* Send data to monitor.  Works just like printf. */
  static void
- #ifdef ANSI_PROTOTYPES
  printf_monitor (char *pattern,...)
- #else
- printf_monitor (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    char buf[200];
    int i;
  
- #ifdef ANSI_PROTOTYPES
    va_start (args, pattern);
- #else
-   char *pattern;
-   va_start (args);
-   pattern = va_arg (args, char *);
- #endif
  
    vsprintf (buf, pattern, args);
    va_end (args);
--- 88,100 ----
Index: remote-rdp.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/remote-rdp.c,v
retrieving revision 2.11
diff -p -r2.11 remote-rdp.c
*** remote-rdp.c	1999/07/07 23:51:48	2.11
--- remote-rdp.c	1999/08/06 09:52:58
***************
*** 42,52 ****
  #include "value.h"
  #include "callback.h"
  #include "command.h"
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
  #include <ctype.h>
  #include <fcntl.h>
  #include "symfile.h"
--- 42,47 ----
*************** rdp_init (cold, tty)
*** 379,401 ****
  }
  
  
- #ifdef ANSI_PROTOTYPES
  void
  send_rdp (char *template,...)
- #else
- void
- send_rdp (char *template, va_alist)
-      va_dcl
- #endif
  {
    char buf[200];
    char *dst = buf;
    va_list alist;
- #ifdef ANSI_PROTOTYPES
    va_start (alist, template);
- #else
-   va_start (alist);
- #endif
  
    while (*template)
      {
--- 374,386 ----
Index: remote-sim.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/remote-sim.c,v
retrieving revision 2.85
diff -p -r2.85 remote-sim.c
*** remote-sim.c	1999/07/07 23:51:49	2.85
--- remote-sim.c	1999/08/06 09:52:59
*************** gdb_os_flush_stderr (p)
*** 243,268 ****
  
  /* GDB version of printf_filtered callback.  */
  
- /* VARARGS */
  static void
- #ifdef ANSI_PROTOTYPES
  gdb_os_printf_filtered (host_callback * p, const char *format,...)
- #else
- gdb_os_printf_filtered (p, va_alist)
-      host_callback *p;
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   char *format;
  
-   va_start (args);
-   format = va_arg (args, char *);
- #endif
- 
    vfprintf_filtered (gdb_stdout, format, args);
  
    va_end (args);
--- 243,254 ----
*************** gdb_os_printf_filtered (p, va_alist)
*** 270,330 ****
  
  /* GDB version of error vprintf_filtered.  */
  
- /* VARARGS */
  static void
- #ifdef ANSI_PROTOTYPES
  gdb_os_vprintf_filtered (host_callback * p, const char *format, va_list ap)
- #else
- gdb_os_vprintf_filtered (p, format, ap)
-      host_callback *p;
-      char *format;
-      va_list ap;
- #endif
  {
    vfprintf_filtered (gdb_stdout, format, ap);
  }
  
  /* GDB version of error evprintf_filtered.  */
  
- /* VARARGS */
  static void
- #ifdef ANSI_PROTOTYPES
  gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap)
- #else
- gdb_os_evprintf_filtered (p, format, ap)
-      host_callback *p;
-      char *format;
-      va_list ap;
- #endif
  {
    vfprintf_filtered (gdb_stderr, format, ap);
  }
  
  /* GDB version of error callback.  */
  
- /* VARARGS */
  static void
- #ifdef ANSI_PROTOTYPES
  gdb_os_error (host_callback * p, const char *format,...)
- #else
- gdb_os_error (p, va_alist)
-      host_callback *p;
-      va_dcl
- #endif
  {
    if (error_hook)
      (*error_hook) ();
    else
      {
        va_list args;
- #ifdef ANSI_PROTOTYPES
        va_start (args, format);
- #else
-       char *format;
- 
-       va_start (args);
-       format = va_arg (args, char *);
- #endif
  
        error_begin ();
        vfprintf_filtered (gdb_stderr, format, args);
--- 256,286 ----
Index: remote-st.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/remote-st.c,v
retrieving revision 2.19
diff -p -r2.19 remote-st.c
*** remote-st.c	1999/07/07 23:51:51	2.19
--- remote-st.c	1999/08/06 09:53:01
***************
*** 39,49 ****
  #include "gdbcore.h"
  #include "target.h"
  #include "wait.h"
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
  #include <signal.h>
  #include "gdb_string.h"
  #include <sys/types.h>
--- 39,44 ----
*************** static serial_t st2000_desc;
*** 71,93 ****
  /* Send data to stdebug.  Works just like printf. */
  
  static void
- #ifdef ANSI_PROTOTYPES
  printf_stdebug (char *pattern,...)
- #else
- printf_stdebug (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    char buf[200];
  
- #ifdef ANSI_PROTOTYPES
    va_start (args, pattern);
- #else
-   char *pattern;
-   va_start (args);
-   pattern = va_arg (args, char *);
- #endif
  
    vsprintf (buf, pattern, args);
    va_end (args);
--- 66,77 ----
Index: serial.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/serial.c,v
retrieving revision 2.32
diff -p -r2.32 serial.c
*** serial.c	1999/07/08 11:05:37	2.32
--- serial.c	1999/08/06 09:53:02
*************** connect_command (args, fromtty)
*** 492,518 ****
  }
  #endif /* 0 */
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  serial_printf (serial_t desc, const char *format,...)
- #else
- serial_printf (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    char *buf;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   serial_t desc;
-   char *format;
- 
-   va_start (args);
-   desc = va_arg (args, serial_t);
-   format = va_arg (args, char *);
- #endif
  
    vasprintf (&buf, format, args);
    SERIAL_WRITE (desc, buf, strlen (buf));
--- 492,503 ----
Index: utils.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/utils.c,v
retrieving revision 1.194
diff -p -r1.194 utils.c
*** utils.c	1999/07/11 16:26:22	1.194
--- utils.c	1999/08/06 09:53:07
*************** warning_begin ()
*** 431,454 ****
     The primary difference between warnings and errors is that a warning
     does not force the return to command level.  */
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  warning (const char *string,...)
- #else
- warning (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, string);
- #else
-   char *string;
- 
-   va_start (args);
-   string = va_arg (args, char *);
- #endif
    if (warning_hook)
      (*warning_hook) (string, args);
    else
--- 431,441 ----
*************** error_begin ()
*** 487,522 ****
     The first argument STRING is the error message, used as a fprintf string,
     and the remaining args are passed as arguments to it.  */
  
- /* VARARGS */
  NORETURN void
- #ifdef ANSI_PROTOTYPES
  error (const char *string,...)
- #else
- error (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, string);
- #else
-   va_start (args);
- #endif
    if (error_hook)
      (*error_hook) ();
    else
      {
        error_begin ();
- #ifdef ANSI_PROTOTYPES
        vfprintf_filtered (gdb_stderr, string, args);
- #else
-       {
- 	char *string1;
- 
- 	string1 = va_arg (args, char *);
- 	vfprintf_filtered (gdb_stderr, string1, args);
-       }
- #endif
        fprintf_filtered (gdb_stderr, "\n");
        va_end (args);
        return_to_top_level (RETURN_ERROR);
--- 474,490 ----
*************** error (va_alist)
*** 531,553 ****
     This function cannot be declared volatile (NORETURN) in an
     ANSI environment because exit() is not declared volatile. */
  
- /* VARARGS */
  NORETURN void
- #ifdef ANSI_PROTOTYPES
  fatal (char *string,...)
- #else
- fatal (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, string);
- #else
-   char *string;
-   va_start (args);
-   string = va_arg (args, char *);
- #endif
    fprintf_unfiltered (gdb_stderr, "\ngdb: ");
    vfprintf_unfiltered (gdb_stderr, string, args);
    fprintf_unfiltered (gdb_stderr, "\n");
--- 499,509 ----
*************** fatal (va_alist)
*** 558,581 ****
  /* Print an error message and exit, dumping core.
     The arguments are printed a la printf ().  */
  
- /* VARARGS */
  static void
- #ifdef ANSI_PROTOTYPES
  fatal_dump_core (char *string,...)
- #else
- fatal_dump_core (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, string);
- #else
-   char *string;
- 
-   va_start (args);
-   string = va_arg (args, char *);
- #endif
    /* "internal error" is always correct, since GDB should never dump
       core, no matter what the input.  */
    fprintf_unfiltered (gdb_stderr, "\ngdb internal error: ");
--- 514,524 ----
*************** gdb_print_address (addr, stream)
*** 1075,1099 ****
  
  /* VARARGS */
  int
- #ifdef ANSI_PROTOTYPES
  query (char *ctlstr,...)
- #else
- query (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
    register int answer;
    register int ans2;
    int retval;
  
- #ifdef ANSI_PROTOTYPES
    va_start (args, ctlstr);
- #else
-   char *ctlstr;
-   va_start (args);
-   ctlstr = va_arg (args, char *);
- #endif
  
    if (query_hook)
      {
--- 1018,1031 ----
*************** vprintf_unfiltered (format, args)
*** 2443,2492 ****
    vfprintf_unfiltered (gdb_stdout, format, args);
  }
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  fprintf_filtered (GDB_FILE * stream, const char *format,...)
- #else
- fprintf_filtered (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   GDB_FILE *stream;
-   char *format;
- 
-   va_start (args);
-   stream = va_arg (args, GDB_FILE *);
-   format = va_arg (args, char *);
- #endif
    vfprintf_filtered (stream, format, args);
    va_end (args);
  }
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  fprintf_unfiltered (GDB_FILE * stream, const char *format,...)
- #else
- fprintf_unfiltered (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   GDB_FILE *stream;
-   char *format;
- 
-   va_start (args);
-   stream = va_arg (args, GDB_FILE *);
-   format = va_arg (args, char *);
- #endif
    vfprintf_unfiltered (stream, format, args);
    va_end (args);
  }
--- 2375,2394 ----
*************** fprintf_unfiltered (va_alist)
*** 2494,2521 ****
  /* Like fprintf_filtered, but prints its result indented.
     Called as fprintfi_filtered (spaces, stream, format, ...);  */
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  fprintfi_filtered (int spaces, GDB_FILE * stream, const char *format,...)
- #else
- fprintfi_filtered (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   int spaces;
-   GDB_FILE *stream;
-   char *format;
- 
-   va_start (args);
-   spaces = va_arg (args, int);
-   stream = va_arg (args, GDB_FILE *);
-   format = va_arg (args, char *);
- #endif
    print_spaces_filtered (spaces, stream);
  
    vfprintf_filtered (stream, format, args);
--- 2396,2406 ----
*************** fprintfi_filtered (va_alist)
*** 2523,2569 ****
  }
  
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  printf_filtered (const char *format,...)
- #else
- printf_filtered (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   char *format;
- 
-   va_start (args);
-   format = va_arg (args, char *);
- #endif
    vfprintf_filtered (gdb_stdout, format, args);
    va_end (args);
  }
  
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  printf_unfiltered (const char *format,...)
- #else
- printf_unfiltered (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   char *format;
- 
-   va_start (args);
-   format = va_arg (args, char *);
- #endif
    vfprintf_unfiltered (gdb_stdout, format, args);
    va_end (args);
  }
--- 2408,2428 ----
*************** printf_unfiltered (va_alist)
*** 2571,2596 ****
  /* Like printf_filtered, but prints it's result indented.
     Called as printfi_filtered (spaces, format, ...);  */
  
- /* VARARGS */
  void
- #ifdef ANSI_PROTOTYPES
  printfi_filtered (int spaces, const char *format,...)
- #else
- printfi_filtered (va_alist)
-      va_dcl
- #endif
  {
    va_list args;
- #ifdef ANSI_PROTOTYPES
    va_start (args, format);
- #else
-   int spaces;
-   char *format;
- 
-   va_start (args);
-   spaces = va_arg (args, int);
-   format = va_arg (args, char *);
- #endif
    print_spaces_filtered (spaces, gdb_stdout);
    vfprintf_filtered (gdb_stdout, format, args);
    va_end (args);
--- 2430,2440 ----