Remove xmalloc.c, backport xalloc.h from tinc 1.1.

[tinc] / src / xalloc.h

diff --git a/src/xalloc.h b/src/xalloc.h
index 952f921..e75f1bb 100644 (file)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -1,29 +1,78 @@
-#include <sys/types.h>
-
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
+/*
+   xalloc.h -- malloc and related fuctions with out of memory checking
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Guus Sliepen <guus@tinc-vpn.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc., Foundation,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
-/* Exit value when the requested amount of memory is not available.
-   The caller may set it to some other value.  */
-extern int xalloc_exit_failure;
+#ifndef __TINC_XALLOC_H__
+#define __TINC_XALLOC_H__
 
-/* FIXME: describe */
-extern char *const xalloc_msg_memory_exhausted;
+static inline void *xmalloc(size_t n) __attribute__ ((__malloc__));
+static inline void *xmalloc(size_t n) {
+       void *p = malloc(n);
+       if(!p)
+               abort();
+       return p;
+}
 
-/* FIXME: describe */
-extern void (*xalloc_fail_func) (int);
+static inline void *xmalloc_and_zero(size_t n) __attribute__ ((__malloc__));
+static inline void *xmalloc_and_zero(size_t n) {
+       void *p = calloc(1, n);
+       if(!p)
+               abort();
+       return p;
+}
 
-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__));
+static inline void *xrealloc(void *p, size_t n) {
+       p = realloc(p, n);
+       if(!p)
+               abort();
+       return p;
+}
 
-char *xstrdup PARAMS ((const char *s)) __attribute__ ((__malloc__));
+static inline char *xstrdup(const char *s) __attribute__ ((__malloc__));
+static inline char *xstrdup(const char *s) {
+       char *p = strdup(s);
+       if(!p)
+               abort();
+       return p;
+}
 
-extern int xasprintf(char **strp, const char *fmt, ...);
-extern int xvasprintf(char **strp, const char *fmt, va_list ap);
+static inline int xvasprintf(char **strp, const char *fmt, va_list ap) {
+#ifdef HAVE_MINGW
+       char buf[1024];
+       int result = vsnprintf(buf, sizeof buf, fmt, ap);
+       if(result < 0)
+               abort();
+       *strp = xstrdup(buf);
+#else
+       int result = vasprintf(strp, fmt, ap);
+       if(result < 0)
+               abort();
+#endif
+       return result;
+}
+
+static inline int xasprintf(char **strp, const char *fmt, ...) __attribute__ ((__format__(printf, 2, 3)));
+static inline int xasprintf(char **strp, const char *fmt, ...) {
+       va_list ap;
+       va_start(ap, fmt);
+       int result = xvasprintf(strp, fmt, ap);
+       va_end(ap);
+       return result;
+}
+
+#endif