gdb/

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

diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
index 2603beb3ef771be92fe6072bbbc9c31689e6b7aa..ec7ed7c0c991932b5f0701859bd08a6559fab7af 100644 (file)
--- a/gdb/gdbserver/utils.c
+++ b/gdb/gdbserver/utils.c
@@ -1,5 +1,6 @@
 /* General utility routines for the remote server for GDB.
-   Copyright (C) 1986, 1989, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1989, 1993, 1995, 1996, 1997, 1999, 2000, 2002, 2003
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -15,8 +16,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "server.h"
 #include <stdio.h>
@@ -29,20 +30,16 @@
    Then return to command level.  */
 
 void
-perror_with_name (string)
-     char *string;
+perror_with_name (char *string)
 {
 #ifndef STDC_HEADERS
-  extern int sys_nerr;
-  extern char *sys_errlist[];
   extern int errno;
 #endif
   const char *err;
   char *combined;
 
-  if (errno < sys_nerr)
-    err = sys_errlist[errno];
-  else
+  err = strerror (errno);
+  if (err == NULL)
     err = "unknown error";
 
   combined = (char *) alloca (strlen (err) + strlen (string) + 3);
@@ -57,33 +54,14 @@ 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 (const char *string,...)
-#else
 void
-error (va_alist)
-     va_dcl
-#endif
+error (const char *string,...)
 {
   extern jmp_buf toplevel;
   va_list args;
-#ifdef ANSI_PROTOTYPES
   va_start (args, string);
-#else
-  va_start (args);
-#endif
   fflush (stdout);
-#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);
 }
@@ -93,25 +71,26 @@ error (va_alist)
    STRING and ARG are passed to fprintf.  */
 
 /* VARARGS */
-NORETURN void
-#ifdef ANSI_PROTOTYPES
-fatal (char *string,...)
-#else
-fatal (va_alist)
-     va_dcl
-#endif
+void
+fatal (const char *string,...)
 {
   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: ");
   vfprintf (stderr, string, args);
   fprintf (stderr, "\n");
   va_end (args);
   exit (1);
 }
+
+/* VARARGS */
+void
+warning (const char *string,...)
+{
+  va_list args;
+  va_start (args, string);
+  fprintf (stderr, "gdb: ");
+  vfprintf (stderr, string, args);
+  fprintf (stderr, "\n");
+  va_end (args);
+}