2011-03-04 Michael Snyder <msnyder@vmware.com>

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

diff --git a/readline/xmalloc.c b/readline/xmalloc.c
index 4160651191bba0f7f1a55e55ed5b837bfe0695aa..8985d340d398cd28f5278c8c275cad0faed4a592 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
 
    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
    later version.
 
    Readline is distributed in the hope that it will be useful, but


@@ -17,7 +17,8 @@
 
    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
 
    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>
 
 #if defined (HAVE_CONFIG_H)
 #include <config.h>


@@ -31,7 +32,7 @@
 #  include "ansi_stdlib.h"
 #endif /* HAVE_STDLIB_H */
 
 #  include "ansi_stdlib.h"
 #endif /* HAVE_STDLIB_H */
 

-static void memory_error_and_abort ();
+#include "xmalloc.h"

 
 /* **************************************************************** */
 /*                                                                 */
 
 /* **************************************************************** */
 /*                                                                 */


@@ -39,48 +40,48 @@ 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. */
 /* 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. */

-char *
+PTR_T

 xmalloc (bytes)
 xmalloc (bytes)

-     int bytes;
+     size_t bytes;

 {
 {

-  char *temp;
+  PTR_T temp;

 
 

-  temp = (char *)malloc (bytes);
+  temp = malloc (bytes);

   if (temp == 0)
     memory_error_and_abort ("xmalloc");
   return (temp);
 }
 
   if (temp == 0)
     memory_error_and_abort ("xmalloc");
   return (temp);
 }
 

-char *
+PTR_T

 xrealloc (pointer, bytes)
 xrealloc (pointer, bytes)

-     char *pointer;
-     int bytes;
+     PTR_T pointer;
+     size_t bytes;

 {
 {

-  char *temp;
+  PTR_T temp;

 
 

-  temp = pointer ? (char *)realloc (pointer, bytes) : (char *)malloc (bytes);
+  temp = pointer ? realloc (pointer, bytes) : malloc (bytes);

 
   if (temp == 0)
     memory_error_and_abort ("xrealloc");
   return (temp);
 }
 
 
   if (temp == 0)
     memory_error_and_abort ("xrealloc");
   return (temp);
 }
 

-static void
-memory_error_and_abort (fname)
-     char *fname;
-{
-  fprintf (stderr, "%s: out of virtual memory\n", fname);
-  exit (2);
-}
-

 /* Use this as the function to call when adding unwind protects so we
    don't need to know what free() returns. */
 void
 xfree (string)
 /* Use this as the function to call when adding unwind protects so we
    don't need to know what free() returns. */
 void
 xfree (string)

-     char *string;
+     PTR_T string;

 {
   if (string)
     free (string);
 {
   if (string)
     free (string);