Date: Thursday May 3, 2001 @ 22:58
Author: cameron
Update of /home/netrek/cvsroot/Vanilla/gum
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv3261/gum
Modified Files:
xmalloc.c
Log Message:
replace non-standard error()
****************************************
Index: Vanilla/gum/xmalloc.c
diff -u Vanilla/gum/xmalloc.c:1.1 Vanilla/gum/xmalloc.c:1.2
--- Vanilla/gum/xmalloc.c:1.1 Wed Jul 28 03:26:56 1999
+++ Vanilla/gum/xmalloc.c Thu May 3 22:58:57 2001
@@ -26,6 +26,7 @@
#endif
#include <sys/types.h>
+#include <stdio.h>
#if STDC_HEADERS
# include <stdlib.h>
@@ -44,8 +45,6 @@
# define _(Text) Text
#endif
-#include "error.h"
-
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
@@ -63,12 +62,6 @@
The caller may set it to some other value. */
int xmalloc_exit_failure = EXIT_FAILURE;
-#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
-void error (int, int, const char *, ...);
-#else
-void error ();
-#endif
-
static VOID *
fixup_null_alloc (n)
size_t n;
@@ -79,7 +72,10 @@
if (n == 0)
p = malloc ((size_t) 1);
if (p == 0)
- error (xmalloc_exit_failure, 0, _("Memory exhausted"));
+ {
+ fprintf(stderr, _("Memory exhausted"));
+ exit(xmalloc_exit_failure);
+ }
return p;
}