aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-12-30 17:41:42 -0500
committerMike Frysinger <vapier@gentoo.org>2013-02-18 17:16:05 -0500
commit6ff444c4184433586a8879376bd5006eb793499a (patch)
treeddd8975f63a62bcc9ebaeb9d6ec4c715743cd029 /iconv
parent4bf6b9dd8ee267cf7b9cd256107624b10f051d0b (diff)
downloadglibc-6ff444c4184433586a8879376bd5006eb793499a.zip
glibc-6ff444c4184433586a8879376bd5006eb793499a.tar.gz
glibc-6ff444c4184433586a8879376bd5006eb793499a.tar.bz2
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 <vapier@gentoo.org>
Diffstat (limited to 'iconv')
-rw-r--r--iconv/iconv_charmap.c5
-rw-r--r--iconv/iconvconfig.c7
-rw-r--r--iconv/strtab.c3
3 files changed, 3 insertions, 12 deletions
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 <programs/xmalloc.h>
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 <programs/xmalloc.h>
/* 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 <programs/xmalloc.h>
/* Prototypes for our functions that are used from iconvconfig.c. If
you change these, change also iconvconfig.c. */