diff options
author | Dan McGee <dan@archlinux.org> | 2012-04-30 06:40:06 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-04-30 06:40:06 +0200 |
commit | 5a9f5c60dae8d173e9e2f6da78499c046600e6ca (patch) | |
tree | 03026ea9b58078964d6b7c6be67378adf17d0610 /lib/libalpm/util.h | |
parent | 4d3170978711a91f1afe8ffef9dad9c2bc60585d (diff) | |
download | pacman-5a9f5c60dae8d173e9e2f6da78499c046600e6ca.tar.gz pacman-5a9f5c60dae8d173e9e2f6da78499c046600e6ca.tar.xz |
Convert ALLOC_FAIL macro into a function
This path is rarely (read: never) taken in any normal run of the code,
so injecting the fprintf() call everywhere with the macro is a bit
overkill. Instead, add a lightweight _alpm_alloc_fail() function that
gets called instead.
This does have a reasonable effect on the size of the generated code;
most places using the macros provided by util.c have their code size
reduced.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/util.h')
-rw-r--r-- | lib/libalpm/util.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index e35e35b9..87d51eaa 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -49,13 +49,13 @@ #define _(s) s #endif -#define ALLOC_FAIL(s) do { fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", s); } while(0) +void _alpm_alloc_fail(size_t size); -#define MALLOC(p, s, action) do { p = malloc(s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) -#define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { ALLOC_FAIL(l * s); action; } } while(0) +#define MALLOC(p, s, action) do { p = malloc(s); if(p == NULL) { _alpm_alloc_fail(s); action; } } while(0) +#define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { _alpm_alloc_fail(l * s); action; } } while(0) /* This strdup macro is NULL safe- copying NULL will yield NULL */ -#define STRDUP(r, s, action) do { if(s != NULL) { r = strdup(s); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) -#define STRNDUP(r, s, l, action) do { if(s != NULL) { r = strndup(s, l); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) +#define STRDUP(r, s, action) do { if(s != NULL) { r = strdup(s); if(r == NULL) { _alpm_alloc_fail(strlen(s)); action; } } else { r = NULL; } } while(0) +#define STRNDUP(r, s, l, action) do { if(s != NULL) { r = strndup(s, l); if(r == NULL) { _alpm_alloc_fail(l); action; } } else { r = NULL; } } while(0) #define FREE(p) do { free(p); p = NULL; } while(0) |