diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-12-30 17:41:42 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-02-18 17:16:05 -0500 |
| commit | 6ff444c4184433586a8879376bd5006eb793499a (patch) | |
| tree | ddd8975f63a62bcc9ebaeb9d6ec4c715743cd029 /locale | |
| parent | 4bf6b9dd8ee267cf7b9cd256107624b10f051d0b (diff) | |
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 'locale')
| -rw-r--r-- | locale/programs/locale.c | 5 | ||||
| -rw-r--r-- | locale/programs/localedef.h | 8 | ||||
| -rw-r--r-- | locale/programs/simple-hash.c | 5 |
3 files changed, 3 insertions, 15 deletions
diff --git a/locale/programs/locale.c b/locale/programs/locale.c index 13e5234954..8dc528c115 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -42,10 +42,7 @@ #include "localeinfo.h" #include "charmap-dir.h" #include "../locarchive.h" - -extern void *xmalloc (size_t n) - __attribute_malloc__ __attribute_alloc_size (1); -extern char *xstrdup (const char *) __attribute_malloc__; +#include <programs/xmalloc.h> #define ARCHIVE_NAME LOCALEDIR "/locale-archive" diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h index 7ca65c6639..e010c72983 100644 --- a/locale/programs/localedef.h +++ b/locale/programs/localedef.h @@ -120,13 +120,7 @@ extern const char *alias_file; /* 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); -extern void *xrealloc (void *o, size_t n) - __attribute_malloc__ __attribute_alloc_size (2); -extern char *xstrdup (const char *) __attribute_malloc__; +#include <programs/xmalloc.h> /* Wrapper to switch LC_CTYPE back to the locale specified in the diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c index 530ba724e8..d65b6fb3f0 100644 --- a/locale/programs/simple-hash.c +++ b/locale/programs/simple-hash.c @@ -52,10 +52,7 @@ #define hashval_t uint32_t #include "hashval.h" -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> typedef struct hash_entry { |