X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fxalloc.h;h=952f9217b953399d4de0cafb7da2917fba9474d4;hp=dbba254ad6b1e2637d711c977d0853dfa0dbb6ab;hb=6d08eb1614b59d5f86a43edda9db06fca72b76cd;hpb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93 diff --git a/lib/xalloc.h b/lib/xalloc.h index dbba254a..952f9217 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -16,11 +16,14 @@ extern int xalloc_exit_failure; extern char *const xalloc_msg_memory_exhausted; /* FIXME: describe */ -extern void (*xalloc_fail_func) (); +extern void (*xalloc_fail_func) (int); -void *xmalloc PARAMS ((size_t n)) __attribute__ ((malloc)); -void *xmalloc_and_zero PARAMS ((size_t n)) __attribute__ ((malloc)); +void *xmalloc PARAMS ((size_t n)) __attribute__ ((__malloc__)); +void *xmalloc_and_zero PARAMS ((size_t n)) __attribute__ ((__malloc__)); void *xcalloc PARAMS ((size_t n, size_t s)); -void *xrealloc PARAMS ((void *p, size_t n)) __attribute__ ((malloc)); +void *xrealloc PARAMS ((void *p, size_t n)) __attribute__ ((__malloc__)); -char *xstrdup PARAMS ((const char *s)) __attribute__ ((malloc)); +char *xstrdup PARAMS ((const char *s)) __attribute__ ((__malloc__)); + +extern int xasprintf(char **strp, const char *fmt, ...); +extern int xvasprintf(char **strp, const char *fmt, va_list ap);