import gdb-1999-11-01 snapshot

[deliverable/binutils-gdb.git] / gdb / gdbserver / utils.c

diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
index de8226b15be37b9c63ffc8fb97dc0aeabb37d314..2603beb3ef771be92fe6072bbbc9c31689e6b7aa 100644 (file)
--- a/gdb/gdbserver/utils.c
+++ b/gdb/gdbserver/utils.c
@@ -1,24 +1,26 @@
 /* General utility routines for the remote server for GDB.
    Copyright (C) 1986, 1989, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-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
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "server.h"
 #include <stdio.h>
+#include <string.h>
 
 /* Generally useful subroutines used throughout the program.  */
 
@@ -30,10 +32,12 @@ void
 perror_with_name (string)
      char *string;
 {
+#ifndef STDC_HEADERS
   extern int sys_nerr;
   extern char *sys_errlist[];
   extern int errno;
-  char *err;
+#endif
+  const char *err;
   char *combined;
 
   if (errno < sys_nerr)
@@ -53,30 +57,61 @@ perror_with_name (string)
    STRING is the error message, used as a fprintf string,
    and ARG is passed as an argument to it.  */
 
+#ifdef ANSI_PROTOTYPES
 NORETURN void
-error (string, arg1, arg2, arg3)
-     char *string;
-     int arg1, arg2, arg3;
+error (const char *string,...)
+#else
+void
+error (va_alist)
+     va_dcl
+#endif
 {
   extern jmp_buf toplevel;
-
+  va_list args;
+#ifdef ANSI_PROTOTYPES
+  va_start (args, string);
+#else
+  va_start (args);
+#endif
   fflush (stdout);
-  fprintf (stderr, string, arg1, arg2, arg3);
+#ifdef ANSI_PROTOTYPES
+  vfprintf (stderr, string, args);
+#else
+  {
+    char *string1;
+
+    string1 = va_arg (args, char *);
+    vfprintf (stderr, string1, args);
+  }
+#endif
   fprintf (stderr, "\n");
-  longjmp(toplevel, 1);
+  longjmp (toplevel, 1);
 }
 
 /* Print an error message and exit reporting failure.
    This is for a error that we cannot continue from.
    STRING and ARG are passed to fprintf.  */
 
-void
-fatal (string, arg)
-     char *string;
-     int arg;
+/* 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 (stderr, "gdb: ");
-  fprintf (stderr, string, arg);
+  vfprintf (stderr, string, args);
   fprintf (stderr, "\n");
+  va_end (args);
   exit (1);
 }