X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fxmalloc.c;h=e1ab3140b79e08c5b2c0077deb564afe041b2c2d;hp=ce1888d8254ce1bd24056f2ec47114c9f550f354;hb=0a3c8cefd4a154948799baaaa246cf0eba050eff;hpb=3d218a31145cf6a4c625ed287cdf3f99e4fd9a03 diff --git a/lib/xmalloc.c b/lib/xmalloc.c index ce1888d8..e1ab3140 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -20,6 +20,8 @@ #endif #include +#include +#include #if STDC_HEADERS # include @@ -86,8 +88,6 @@ xmalloc (n) size_t n; { void *p; - extern char*cp_file; - extern int cp_line; p = malloc (n); if (p == 0) @@ -95,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. */ @@ -110,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. */