New module 'xallocsa'.

diff --git a/ChangeLog b/ChangeLog
index 15f21c3674ce78f4c5c518af756896929035b408..7e9e9a7c5b26de576b2e65de8341aea530de0a5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20  Bruno Haible  <bruno@clisp.org>
+
+       * modules/xallocsa: New file.
+       * MODULES.html.sh (func_all_modules): Add xallocsa.
+
 2004-01-20  Bruno Haible  <bruno@clisp.org>
 
        * modules/allocsa: New file.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 738a38d790f0c0ce74f79c2fd4f448cbad8d79c8..0821cb4cce5f485cc15f8d8752b452546484f8b1 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1461,6 +1461,7 @@ func_all_modules ()
   func_module xalloc
   func_module alloca
   func_module allocsa
+  func_module xallocsa
   func_end_table
 
   element="Integer arithmetic functions <stdlib.h>"

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1d697353673cdcd2ee4bd60ec5b11c3fe7955114..4eb66fc40333bff28b2dad4de905a73739f271c3 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-24  Bruno Haible  <bruno@clisp.org>
+
+       * xallocsa.h: New file, from GNU gettext.
+       * xallocsa.c: New file, from GNU gettext.
+
 2003-11-24  Bruno Haible  <bruno@clisp.org>
 
        * allocsa.h: New file, from GNU gettext.

diff --git a/lib/xallocsa.c b/lib/xallocsa.c
new file mode 100644 (file)
index 0000000..2c7286a
--- /dev/null
+++ b/lib/xallocsa.c
@@ -0,0 +1,37 @@
+/* Safe automatic memory allocation with out of memory checking.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   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, 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.
+
+   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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "xallocsa.h"
+
+#include "xalloc.h"
+
+void *
+xmallocsa (size_t n)
+{
+  void *p;
+
+  p = mallocsa (n);
+  if (p == NULL)
+    xalloc_die ();
+  return p;
+}

diff --git a/lib/xallocsa.h b/lib/xallocsa.h
new file mode 100644 (file)
index 0000000..9b11142
--- /dev/null
+++ b/lib/xallocsa.h
@@ -0,0 +1,42 @@
+/* Safe automatic memory allocation with out of memory checking.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   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, 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.
+
+   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.  */
+
+#ifndef _XALLOCSA_H
+#define _XALLOCSA_H
+
+#include "allocsa.h"
+
+/* xallocsa(N) is a checking safe variant of alloca(N).  It allocates N bytes
+   of memory allocated on the stack, that must be freed using freesa() before
+   the function returns.  Upon failure, it exits with an error message.  */
+#if HAVE_ALLOCA
+# define xallocsa(N) \
+  ((N) < 4032 - sa_increment                                       \
+   ? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \
+   : xmallocsa (N))
+extern void * xmallocsa (size_t n);
+#else
+# define xallocsa(N) \
+  xmalloc (N)
+#endif
+
+/* Maybe we should also define a variant
+    xnallocsa (size_t n, size_t s) - behaves like xallocsa (n * s)
+   If this would be useful in your application. please speak up.  */
+
+#endif /* _XALLOCSA_H */

diff --git a/modules/xallocsa b/modules/xallocsa
new file mode 100644 (file)
index 0000000..98a0b4c
--- /dev/null
+++ b/modules/xallocsa
@@ -0,0 +1,21 @@
+Description:
+Safe automatic memory allocation with out of memory checking.
+
+Files:
+lib/xallocsa.h
+lib/xallocsa.c
+
+Depends-on:
+allocsa
+xalloc
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xallocsa.h xallocsa.c
+
+Include:
+#include "xallocsa.h"
+
+Maintainer:
+Bruno Haible