From 6ff444c4184433586a8879376bd5006eb793499a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 30 Dec 2012 17:41:42 -0500 Subject: unify xmalloc prototypes & friends These prototypes are duplicated in many places. Add a dedicated header for holding prototypes for program-specific functions to avoid that. Signed-off-by: Mike Frysinger --- iconv/iconv_charmap.c | 5 +---- iconv/iconvconfig.c | 7 +------ iconv/strtab.c | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'iconv') diff --git a/iconv/iconv_charmap.c b/iconv/iconv_charmap.c index 7a4067b..b1a0610 100644 --- a/iconv/iconv_charmap.c +++ b/iconv/iconv_charmap.c @@ -32,10 +32,7 @@ /* Prototypes for a few program-wide used functions. */ -extern void *xmalloc (size_t n) - __attribute_malloc__ __attribute_alloc_size (1); -extern void *xcalloc (size_t n, size_t s) - __attribute_malloc__ __attribute_alloc_size (1, 2); +#include struct convtable diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 318c917..677620b 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -247,12 +247,7 @@ static struct static const char gconv_module_ext[] = MODULE_EXT; -extern void *xmalloc (size_t n) - __attribute_malloc__ __attribute_alloc_size (1); -extern void *xcalloc (size_t n, size_t s) - __attribute_malloc__ __attribute_alloc_size (1, 2); -extern void *xrealloc (void *o, size_t n) - __attribute_malloc__ __attribute_alloc_size (2); +#include /* C string table handling. */ diff --git a/iconv/strtab.c b/iconv/strtab.c index 7160ac8..c62553e 100644 --- a/iconv/strtab.c +++ b/iconv/strtab.c @@ -65,8 +65,7 @@ struct Strtab static size_t ps; -extern void *xmalloc (size_t n) - __attribute_malloc__ __attribute_alloc_size (1); +#include /* Prototypes for our functions that are used from iconvconfig.c. If you change these, change also iconvconfig.c. */ -- cgit v1.1