j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Don't use error.h or error(), put #error in front of cpp errors.

Browse source
This commit is contained in:
Ivo Timmermans 2000-05-03 23:00:38 +00:00
parent a083b1cf30
commit 3d218a3114
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/xmalloc.c
View file

@ -39,7 +39,6 @@ void free ();
#endif #endif
#define N_(Text) Text #define N_(Text) Text
#include "error.h"
#include "xalloc.h" #include "xalloc.h"
#ifndef EXIT_FAILURE #ifndef EXIT_FAILURE
@ -54,11 +53,11 @@ void *xrealloc (void *p, size_t n);
#endif #endif
#ifndef HAVE_DONE_WORKING_MALLOC_CHECK #ifndef HAVE_DONE_WORKING_MALLOC_CHECK
you must run the autoconf test for a properly working malloc -- see malloc.m4 #error you must run the autoconf test for a properly working malloc -- see malloc.m4
#endif #endif
#ifndef HAVE_DONE_WORKING_REALLOC_CHECK #ifndef HAVE_DONE_WORKING_REALLOC_CHECK
you must run the autoconf test for a properly working realloc -- see realloc.m4 #error you must run the autoconf test for a properly working realloc -- see realloc.m4
#endif #endif
/* Exit value when the requested amount of memory is not available. /* Exit value when the requested amount of memory is not available.
@ -71,18 +70,13 @@ char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
/* FIXME: describe */ /* FIXME: describe */
void (*xalloc_fail_func) (int) = 0; void (*xalloc_fail_func) (int) = 0;
#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
void error (int, int, const char *, ...);
#else
void error ();
#endif
static void static void
xalloc_fail (int size) xalloc_fail (int size)
{ {
if (xalloc_fail_func) if (xalloc_fail_func)
(*xalloc_fail_func) (size); (*xalloc_fail_func) (size);
error (xalloc_exit_failure, 0, xalloc_msg_memory_exhausted); fprintf(stderr, "%s\n", xalloc_msg_memory_exhausted);
exit(xalloc_exit_failure);
} }
/* Allocate N bytes of memory dynamically, with error checking. */ /* Allocate N bytes of memory dynamically, with error checking. */