X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fxmalloc.c;h=e1ab3140b79e08c5b2c0077deb564afe041b2c2d;hp=6cb0b82bff7120167086018344875596f460e4c5;hb=8ea23d9ec3f2fe0c113eac5caafb7c2bd03f3016;hpb=baebae274913d912d76ba1d545f337dfb945fc5c diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 6cb0b82b..e1ab3140 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -20,6 +20,8 @@ #endif #include +#include +#include #if STDC_HEADERS # include @@ -39,7 +41,6 @@ void free (); #endif #define N_(Text) Text -#include "error.h" #include "xalloc.h" #ifndef EXIT_FAILURE @@ -54,11 +55,11 @@ void *xrealloc (void *p, size_t n); #endif #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 #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 /* Exit value when the requested amount of memory is not available. @@ -71,18 +72,13 @@ char *const xalloc_msg_memory_exhausted = N_("Memory exhausted"); /* FIXME: describe */ void (*xalloc_fail_func) (int) = 0; -#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT) -void error (int, int, const char *, ...); -#else -void error (); -#endif - static void xalloc_fail (int size) { if (xalloc_fail_func) (*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. */ @@ -92,8 +88,6 @@ xmalloc (n) size_t n; { void *p; - extern char*cp_file; - extern int cp_line; p = malloc (n); if (p == 0) @@ -101,6 +95,21 @@ xmalloc (n) return p; } +/* Allocate N bytes of memory dynamically, and set it all to zero. */ + +void * +xmalloc_and_zero (n) + size_t n; +{ + void *p; + + p = malloc (n); + if (p == 0) + xalloc_fail ((int)n); + memset (p, '\0', 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. */ @@ -116,6 +125,18 @@ xrealloc (p, n) return p; } +/* Duplicate a string */ + +char *xstrdup(const char *s) +{ + char *p; + + p = strdup(s); + if(!p) + xalloc_fail ((int)strlen(s)); + return p; +} + #ifdef NOT_USED /* Allocate memory for N elements of S bytes, with error checking. */