summaryrefslogtreecommitdiffstats
path: root/lib/xalloc.h
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2006-05-18 22:05:43 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2006-05-18 22:05:43 (GMT)
commita8cd7705e7898d77764aa12ddcc2e29de1860138 (patch)
tree970f609cbecbe515998907fd55a12f814ad2edcd /lib/xalloc.h
parent08394ddb2d62ec8aab9121e45ab9c1a102e85ba4 (diff)
downloadmonitoring-plugins-a8cd7705e7898d77764aa12ddcc2e29de1860138.tar.gz
Synchronise with coreutils 2.95. Gettext now synced with coreutils,
so no longer development platform requirement git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1394 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'lib/xalloc.h')
-rw-r--r--lib/xalloc.h42
1 files changed, 17 insertions, 25 deletions
diff --git a/lib/xalloc.h b/lib/xalloc.h
index 4b65858..f80977e 100644
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -1,7 +1,7 @@
1/* xalloc.h -- malloc with out-of-memory checking 1/* xalloc.h -- malloc with out-of-memory checking
2 2
3 Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 3 Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
4 1999, 2000, 2003 Free Software Foundation, Inc. 4 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
5 5
6 This program is free software; you can redistribute it and/or modify 6 This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 7 it under the terms of the GNU General Public License as published by
@@ -15,13 +15,19 @@
15 15
16 You should have received a copy of the GNU General Public License 16 You should have received a copy of the GNU General Public License
17 along with this program; if not, write to the Free Software Foundation, 17 along with this program; if not, write to the Free Software Foundation,
18 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ 18 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
19 19
20#ifndef XALLOC_H_ 20#ifndef XALLOC_H_
21# define XALLOC_H_ 21# define XALLOC_H_
22 22
23# include <stddef.h> 23# include <stddef.h>
24 24
25
26# ifdef __cplusplus
27extern "C" {
28# endif
29
30
25# ifndef __attribute__ 31# ifndef __attribute__
26# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ 32# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
27# define __attribute__(x) 33# define __attribute__(x)
@@ -32,18 +38,9 @@
32# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) 38# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
33# endif 39# endif
34 40
35/* If this pointer is non-zero, run the specified function upon each 41/* This function is always triggered when memory is exhausted.
36 allocation failure. It is initialized to zero. */ 42 It must be defined by the application, either explicitly
37extern void (*xalloc_fail_func) (void); 43 or by using gnulib's xalloc-die module. This is the
38
39/* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
40 message is output. It is translated via gettext.
41 Its value is "memory exhausted". */
42extern char const xalloc_msg_memory_exhausted[];
43
44/* This function is always triggered when memory is exhausted. It is
45 in charge of honoring the two previous items. It exits with status
46 exit_failure (defined in exitfail.h). This is the
47 function to call when one wants the program to die because of a 44 function to call when one wants the program to die because of a
48 memory allocation failure. */ 45 memory allocation failure. */
49extern void xalloc_die (void) ATTRIBUTE_NORETURN; 46extern void xalloc_die (void) ATTRIBUTE_NORETURN;
@@ -56,8 +53,8 @@ void *xrealloc (void *p, size_t s);
56void *xnrealloc (void *p, size_t n, size_t s); 53void *xnrealloc (void *p, size_t n, size_t s);
57void *x2realloc (void *p, size_t *pn); 54void *x2realloc (void *p, size_t *pn);
58void *x2nrealloc (void *p, size_t *pn, size_t s); 55void *x2nrealloc (void *p, size_t *pn, size_t s);
59void *xclone (void const *p, size_t s); 56void *xmemdup (void const *p, size_t s);
60char *xstrdup (const char *str); 57char *xstrdup (char const *str);
61 58
62/* Return 1 if an array of N objects, each of size S, cannot exist due 59/* Return 1 if an array of N objects, each of size S, cannot exist due
63 to size arithmetic overflow. S must be positive and N must be 60 to size arithmetic overflow. S must be positive and N must be
@@ -74,14 +71,9 @@ char *xstrdup (const char *str);
74# define xalloc_oversized(n, s) \ 71# define xalloc_oversized(n, s) \
75 ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) 72 ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
76 73
77/* These macros are deprecated; they will go away soon, and are retained 74# ifdef __cplusplus
78 temporarily only to ease conversion to the functions described above. */ 75}
79# define CCLONE(p, n) xclone (p, (n) * sizeof *(p)) 76# endif
80# define CLONE(p) xclone (p, sizeof *(p)) 77
81# define NEW(type, var) type *var = xmalloc (sizeof (type))
82# define XCALLOC(type, n) xcalloc (n, sizeof (type))
83# define XMALLOC(type, n) xnmalloc (n, sizeof (type))
84# define XREALLOC(p, type, n) xnrealloc (p, n, sizeof (type))
85# define XFREE(p) free (p)
86 78
87#endif /* !XALLOC_H_ */ 79#endif /* !XALLOC_H_ */