From cc754bc6e3be0f37ca0eaca4b6b90f033433fb1a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 29 Oct 2007 01:00:52 -0500 Subject: libalpm: introduce MALLOC and CALLOC macros These macros take the place of the common 4 or 5 line blocks of code we had in most places that called malloc or calloc. This should reduce some code duplication and make memory allocation more standard in libalpm. Highlights: * Note that the MALLOC macro actually uses calloc, this is just for safety so that memory is initialized to 0. This can be easily changed in one place. * One malloc call was completely eliminated- it made more sense to do it on the stack. * The use of RET_ERR in public functions (mainly the alpm_*_new functions) was standardized, this makes sense so pm_errno is set. Signed-off-by: Dan McGee --- lib/libalpm/delta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/libalpm/delta.c') diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 00ed46cb..626ffb31 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -26,6 +26,7 @@ /* libalpm */ #include "delta.h" +#include "error.h" #include "util.h" #include "log.h" #include "alpm_list.h" @@ -235,7 +236,7 @@ pmdelta_t *_alpm_delta_parse(char *line) pmdelta_t *delta; char *tmp = line, *tmp2; - delta = malloc(sizeof(pmdelta_t)); + CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); tmp2 = tmp; tmp = strchr(tmp, ' '); -- cgit v1.2.3-24-g4f1b