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

Drop the GNU malloc.c, realloc.c, and xmalloc.c.

Browse source 
We live in the 21st century, and we require C99 semantics, so we do not need to
work around buggy libcs. The xmalloc() and related functions are now static
inline functions.
This commit is contained in:
Guus Sliepen 2011-06-02 17:45:06 +02:00
parent e452a933f9
commit 25b467638a
8 changed files with 66 additions and 767 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/xalloc.h
View file

@ -1,29 +1,66 @@
#include <sys/types.h>
/*
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 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. */
#ifndef __TINC_XALLOC_H__
#define __TINC_XALLOC_H__
static inline void *xmalloc(size_t n) {
void *p = malloc(n);
if(!p)
abort();
return p;
}
static inline void *xmalloc_and_zero(size_t n) {
void *p = calloc(1, n);
if(!p)
abort();
return p;
}
static inline void *xrealloc(void *p, size_t n) {
p = realloc(p, n);
if(!p)
abort();
return p;
}
static inline char *xstrdup(const char *s) {
char *p = strdup(s);
if(!p)
abort();
return p;
}
static inline int xvasprintf(char **strp, const char *fmt, va_list ap) {
int result = vasprintf(strp, fmt, ap);
if(result < 0)
abort();
return result;
}
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;
}
#ifndef PARAMS
# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
# define PARAMS(Args) Args
# else
# define PARAMS(Args) ()
# endif
#endif
/* 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;
/* FIXME: describe */
extern char *const xalloc_msg_memory_exhausted;
/* FIXME: describe */
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 *xcalloc PARAMS ((size_t n, size_t s));
void *xrealloc PARAMS ((void *p, size_t n)) __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);