From: Bruno Haible <bruno@clisp.org>
Date: Thu, 13 Feb 2003 21:41:54 +0000 (+0000)
Subject: Move lib/xmalloc.c to gettext-runtime/lib/xmalloc.c and gettext-tools/lib/xmalloc.c.
X-Git-Tag: v0.12~902
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffc56af188d00f1805647f1560661c13b0ebff84;p=thirdparty%2Fgettext.git

Move lib/xmalloc.c to gettext-runtime/lib/xmalloc.c and gettext-tools/lib/xmalloc.c.
---

diff --git a/lib/xmalloc.c b/gettext-runtime/lib/xmalloc.c
similarity index 100%
rename from lib/xmalloc.c
rename to gettext-runtime/lib/xmalloc.c
diff --git a/gettext-tools/lib/xmalloc.c b/gettext-tools/lib/xmalloc.c
new file mode 100644
index 000000000..ed757d2a9
--- /dev/null
+++ b/gettext-tools/lib/xmalloc.c
@@ -0,0 +1,90 @@
+/* xmalloc.c -- malloc with out of memory checking
+   Copyright (C) 1990-1996, 2000-2002 Free Software Foundation, Inc.
+
+   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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "xmalloc.h"
+
+#include <stdlib.h>
+
+#include "error.h"
+#include "exit.h"
+#include "gettext.h"
+
+#define _(str) gettext (str)
+
+
+/* Exit value when the requested amount of memory is not available.
+   The caller may set it to some other value.  */
+int xmalloc_exit_failure = EXIT_FAILURE;
+
+static void *
+fixup_null_alloc (size_t n)
+{
+  void *p;
+
+  p = 0;
+  if (n == 0)
+    p = malloc ((size_t) 1);
+  if (p == NULL)
+    error (xmalloc_exit_failure, 0, _("memory exhausted"));
+  return p;
+}
+
+/* Allocate N bytes of memory dynamically, with error checking.  */
+
+void *
+xmalloc (size_t n)
+{
+  void *p;
+
+  p = malloc (n);
+  if (p == NULL)
+    p = fixup_null_alloc (n);
+  return p;
+}
+
+/* Allocate memory for N elements of S bytes, with error checking.  */
+
+void *
+xcalloc (size_t n, size_t s)
+{
+  void *p;
+
+  p = calloc (n, s);
+  if (p == NULL)
+    p = fixup_null_alloc (n);
+  return p;
+}
+
+/* Change the size of an allocated block of memory P to N bytes,
+   with error checking.
+   If P is NULL, run xmalloc.  */
+
+void *
+xrealloc (void *p, size_t n)
+{
+  if (p == NULL)
+    return xmalloc (n);
+  p = realloc (p, n);
+  if (p == NULL)
+    p = fixup_null_alloc (n);
+  return p;
+}