bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert ALLOC_FAIL macro into a function

Browse source 
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>
This commit is contained in:
Dan McGee 2012-04-29 23:40:06 -05:00
parent 4d31709787
commit 5a9f5c60da
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/be_local.c
View file

@ -667,7 +667,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
} }
files = realloc(files, sizeof(alpm_file_t) * files_size); files = realloc(files, sizeof(alpm_file_t) * files_size);
if(!files) { if(!files) {
ALLOC_FAIL(sizeof(alpm_file_t) * files_size); _alpm_alloc_fail(sizeof(alpm_file_t) * files_size);
goto error; goto error;
} }
/* ensure all new memory is zeroed out, in both the initial /* ensure all new memory is zeroed out, in both the initial
@ -680,7 +680,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
len += 1; len += 1;
files[files_count].name = malloc(len); files[files_count].name = malloc(len);
if(files[files_count].name == NULL) { if(files[files_count].name == NULL) {
ALLOC_FAIL(len); _alpm_alloc_fail(len);
goto error; goto error;
} }
memcpy(files[files_count].name, line, len); memcpy(files[files_count].name, line, len);

2
lib/libalpm/be_package.c
View file

@ -476,7 +476,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
newfiles = realloc(newpkg->files.files, newfiles = realloc(newpkg->files.files,
sizeof(alpm_file_t) * files_size); sizeof(alpm_file_t) * files_size);
if(!newfiles) { if(!newfiles) {
ALLOC_FAIL(sizeof(alpm_file_t) * files_size); _alpm_alloc_fail(sizeof(alpm_file_t) * files_size);
goto error; goto error;
} }
/* ensure all new memory is zeroed out, in both the initial /* ensure all new memory is zeroed out, in both the initial

5
lib/libalpm/util.c
View file

@ -1247,6 +1247,11 @@ int _alpm_fnmatch(const void *pattern, const void *string)
return fnmatch(pattern, string, 0); return fnmatch(pattern, string, 0);
} }
void _alpm_alloc_fail(size_t size)
{
fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size);
}
#ifndef HAVE_STRNDUP #ifndef HAVE_STRNDUP
/* A quick and dirty implementation derived from glibc */ /* A quick and dirty implementation derived from glibc */
/** Determines the length of a fixed-size string. /** Determines the length of a fixed-size string.

10
lib/libalpm/util.h
View file

@ -49,13 +49,13 @@
#define _(s) s #define _(s) s
#endif #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 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) { ALLOC_FAIL(l * 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 */ /* 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 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) { 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) #define FREE(p) do { free(p); p = NULL; } while(0)