2001-06-15 Elena Zannoni <ezannoni@redhat.com>

[deliverable/binutils-gdb.git] / readline / xmalloc.c

diff --git a/readline/xmalloc.c b/readline/xmalloc.c
index 0ed49ddad6e35de7e17f85eb8ef15fb02f3d708b..c0d06403a3c44467c5ead6ef5983dffae02b024f 100644 (file)
--- a/readline/xmalloc.c
+++ b/readline/xmalloc.c
@@ -7,7 +7,7 @@
 
    Readline 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 1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    Readline is distributed in the hope that it will be useful, but
@@ -17,17 +17,22 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
-   Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#define READLINE_LIBRARY
+
+#if defined (HAVE_CONFIG_H)
+#include <config.h>
+#endif
 
-#if defined (ALREADY_HAVE_XMALLOC)
-#else
 #include <stdio.h>
 
 #if defined (HAVE_STDLIB_H)
 #  include <stdlib.h>
+#else
+#  include "ansi_stdlib.h"
 #endif /* HAVE_STDLIB_H */
 
-static void memory_error_and_abort ();
+#include "xmalloc.h"
 
 /* **************************************************************** */
 /*                                                                 */
@@ -35,6 +40,14 @@ static void memory_error_and_abort ();
 /*                                                                 */
 /* **************************************************************** */
 
+static void
+memory_error_and_abort (fname)
+     char *fname;
+{
+  fprintf (stderr, "%s: out of virtual memory\n", fname);
+  exit (2);
+}
+
 /* Return a pointer to free()able block of memory large enough
    to hold BYTES number of bytes.  If the memory cannot be allocated,
    print an error message and abort. */
@@ -42,35 +55,34 @@ char *
 xmalloc (bytes)
      int bytes;
 {
-  char *temp = (char *)malloc (bytes);
+  char *temp;
 
-  if (!temp)
+  temp = (char *)malloc (bytes);
+  if (temp == 0)
     memory_error_and_abort ("xmalloc");
   return (temp);
 }
 
 char *
 xrealloc (pointer, bytes)
-     char *pointer;
+     PTR_T pointer;
      int bytes;
 {
   char *temp;
 
-  if (!pointer)
-    temp = (char *)malloc (bytes);
-  else
-    temp = (char *)realloc (pointer, bytes);
+  temp = pointer ? (char *)realloc (pointer, bytes) : (char *)malloc (bytes);
 
-  if (!temp)
+  if (temp == 0)
     memory_error_and_abort ("xrealloc");
   return (temp);
 }
 
-static void
-memory_error_and_abort (fname)
-     char *fname;
+/* Use this as the function to call when adding unwind protects so we
+   don't need to know what free() returns. */
+void
+xfree (string)
+     PTR_T string;
 {
-  fprintf (stderr, "%s: Out of virtual memory!\n", fname);
-  abort ();
+  if (string)
+    free (string);
 }
-#endif /* !ALREADY_HAVE_XMALLOC */