summaryrefslogtreecommitdiff
path: root/lib/libalpm/group.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-10-29 01:00:52 -0500
committerDan McGee <dan@archlinux.org>2007-10-29 01:00:52 -0500
commitcc754bc6e3be0f37ca0eaca4b6b90f033433fb1a (patch)
treea9940053625e4b4e9b5d345eb1ac441a911f6efa /lib/libalpm/group.c
parentfe3a461703a5d90937c0c6f1ce0c3d802c0f8630 (diff)
downloadpacman-cc754bc6e3be0f37ca0eaca4b6b90f033433fb1a.tar.xz
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 <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/group.c')
-rw-r--r--lib/libalpm/group.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c
index 7a6db163..4ad39d6d 100644
--- a/lib/libalpm/group.c
+++ b/lib/libalpm/group.c
@@ -39,12 +39,7 @@ pmgrp_t *_alpm_grp_new()
ALPM_LOG_FUNC;
- grp = calloc(1, sizeof(pmgrp_t));
- if(grp == NULL) {
- _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes\n"),
- sizeof(pmgrp_t));
- RET_ERR(PM_ERR_MEMORY, NULL);
- }
+ CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL));
return(grp);
}