Remove dependency of alloca on xalloc.

diff --git a/ChangeLog b/ChangeLog
index 890f977dc02d0e534767f3d90549d23b44978752..d3fc3612ce41beca4b8a3f42ea71e76ab94349a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-24  Paul Eggert  <eggert@twinsun.com>
+
+       * modules/alloca: Remove dependency on xalloc.
+
 2003-11-17  Paul Eggert  <eggert@twinsun.com>
 
        * README: Mention that S+T cannot overflow if S is the size of

diff --git a/lib/ChangeLog b/lib/ChangeLog
index f753cfe258f36df969c4a358a461e9ae2818715c..7a84430fba3c783ecbac25ee6c1a5dfb0478dca2 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-24  Paul Eggert  <eggert@twinsun.com>
+
+       * lib/alloca.c: Remove dependency on xalloc module.
+       (xalloc_die): Remove.
+       (memory_full) [!defined emacs]: New macro.
+       [!defined emacs]: Don't include xalloc.h.
+       (alloca): Invoke memory_full, not xalloc_die, if malloc fails or
+       address arithmetic overflows.  Change datatypes a bit to avoid
+       unnecessary casts.
+
 2003-11-22  Jim Meyering  <jim@meyering.net>
 
        * xmalloc.c (x2nrealloc_inline): Fix typos in comments: s/size/size_t/.

diff --git a/lib/alloca.c b/lib/alloca.c
index 5e2521b363fdbdd04686b37066a29d35033e0f26..a580078696b27a472b607d73f9b4083e0160e4bb 100644 (file)
--- a/lib/alloca.c
+++ b/lib/alloca.c
@@ -31,13 +31,12 @@
 #ifdef emacs
 # include "lisp.h"
 # include "blockinput.h"
-# define xalloc_die() memory_full ()
 # ifdef EMACS_FREE
 #  undef free
 #  define free EMACS_FREE
 # endif
 #else
-# include <xalloc.h>
+# define memory_full() abort ()
 #endif
 
 /* If compiling with GCC 2, this file's not needed.  */
@@ -196,22 +195,25 @@ alloca (size_t size)
 
   {
     /* Address of header.  */
-    register void *new;
+    register header *new;
 
     size_t combined_size = sizeof (header) + size;
     if (combined_size < sizeof (header))
-      xalloc_die ();
+      memory_full ();
 
-    new = xmalloc (combined_size);
+    new = malloc (combined_size);
 
-    ((header *) new)->h.next = last_alloca_header;
-    ((header *) new)->h.deep = depth;
+    if (! new)
+      memory_full ();
 
-    last_alloca_header = (header *) new;
+    new->h.next = last_alloca_header;
+    new->h.deep = depth;
+
+    last_alloca_header = new;
 
     /* User storage begins just after header.  */
 
-    return (void *) ((char *) new + sizeof (header));
+    return (void *) (new + 1);
   }
 }
 

diff --git a/modules/alloca b/modules/alloca
index 5719b4b5933ffab29cdc001912077b8f9d6a6c10..f93d5e3861ec23c057cdc475b218433a121fec11 100644 (file)
--- a/modules/alloca
+++ b/modules/alloca
@@ -7,7 +7,6 @@ lib/alloca.c
 m4/alloca.m4
 
 Depends-on:
-xalloc
 
 configure.ac:
 gl_FUNC_ALLOCA