projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include <stdlib.h>.
[gnulib.git]
/
lib
/
xalloc.h
diff --git
a/lib/xalloc.h
b/lib/xalloc.h
index
098a6c2
..
c6ca117
100644
(file)
--- a/
lib/xalloc.h
+++ b/
lib/xalloc.h
@@
-1,5
+1,7
@@
/* xalloc.h -- malloc with out-of-memory checking
/* xalloc.h -- malloc with out-of-memory checking
- Copyright (C) 1990-1998, 1999, 2000 Free Software Foundation, Inc.
+
+ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2003 Free Software Foundation, Inc.
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
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
@@
-18,13
+20,7
@@
#ifndef XALLOC_H_
# define XALLOC_H_
#ifndef XALLOC_H_
# define XALLOC_H_
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-# endif
+# include <stddef.h>
# ifndef __attribute__
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
# ifndef __attribute__
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
@@
-36,14
+32,9
@@
# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
# endif
# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
# endif
-/* Exit value when the requested amount of memory is not available.
- It is initialized to EXIT_FAILURE, but the caller may set it to
- some other value. */
-extern int xalloc_exit_failure;
-
/* If this pointer is non-zero, run the specified function upon each
allocation failure. It is initialized to zero. */
/* If this pointer is non-zero, run the specified function upon each
allocation failure. It is initialized to zero. */
-extern void (*xalloc_fail_func)
PARAMS ((void)
);
+extern void (*xalloc_fail_func)
(void
);
/* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
message is output. It is translated via gettext.
/* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
message is output. It is translated via gettext.
@@
-51,20
+42,20
@@
extern void (*xalloc_fail_func) PARAMS ((void));
extern char const xalloc_msg_memory_exhausted[];
/* This function is always triggered when memory is exhausted. It is
extern char const xalloc_msg_memory_exhausted[];
/* This function is always triggered when memory is exhausted. It is
- in charge of honoring the three previous items. This is the
+ in charge of honoring the two previous items. It exits with status
+ exit_failure (defined in exitfail.h). This is the
function to call when one wants the program to die because of a
memory allocation failure. */
function to call when one wants the program to die because of a
memory allocation failure. */
-extern void xalloc_die
PARAMS ((void)
) ATTRIBUTE_NORETURN;
+extern void xalloc_die
(void
) ATTRIBUTE_NORETURN;
-void *xmalloc
PARAMS ((size_t n)
);
-void *xcalloc
PARAMS ((size_t n, size_t s)
);
-void *xrealloc
PARAMS ((void *p, size_t n)
);
-char *xstrdup
PARAMS ((const char *str)
);
+void *xmalloc
(size_t n
);
+void *xcalloc
(size_t n, size_t s
);
+void *xrealloc
(void *p, size_t n
);
+char *xstrdup
(const char *str
);
-# define XMALLOC(Type, N_items) ((Type *) xmalloc (sizeof (Type) * (N_items)))
-# define XCALLOC(Type, N_items) ((Type *) xcalloc (sizeof (Type), (N_items)))
-# define XREALLOC(Ptr, Type, N_items) \
- ((Type *) xrealloc ((void *) (Ptr), sizeof (Type) * (N_items)))
+# define XMALLOC(Type, N_items) xmalloc (sizeof (Type) * (N_items))
+# define XCALLOC(Type, N_items) xcalloc (sizeof (Type), N_items)
+# define XREALLOC(Ptr, Type, N_items) xrealloc (Ptr, sizeof (Type) * (N_items))
/* Declare and alloc memory for VAR of type TYPE. */
# define NEW(Type, Var) Type *(Var) = XMALLOC (Type, 1)
/* Declare and alloc memory for VAR of type TYPE. */
# define NEW(Type, Var) Type *(Var) = XMALLOC (Type, 1)
@@
-78,7
+69,7
@@
char *xstrdup PARAMS ((const char *str));
/* Return a pointer to a malloc'ed copy of the array SRC of NUM elements. */
# define CCLONE(Src, Num) \
/* Return a pointer to a malloc'ed copy of the array SRC of NUM elements. */
# define CCLONE(Src, Num) \
- (memcpy (xmalloc (sizeof
(*Src) * (Num)), (Src), sizeof (*
Src) * (Num)))
+ (memcpy (xmalloc (sizeof
*(Src) * (Num)), Src, sizeof *(
Src) * (Num)))
/* Return a malloc'ed copy of SRC. */
# define CLONE(Src) CCLONE (Src, 1)
/* Return a malloc'ed copy of SRC. */
# define CLONE(Src) CCLONE (Src, 1)