Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/group.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libalpm/group.c')
-rw-r--r--lib/libalpm/group.c24
1 files changed, 6 insertions, 18 deletions
diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c
index 398c2588..13a216ee 100644
--- a/lib/libalpm/group.c
+++ b/lib/libalpm/group.c
@@ -21,7 +21,6 @@
#include "config.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
/* libalpm */
@@ -35,18 +34,14 @@ pmgrp_t *_alpm_grp_new(const char *name)
{
pmgrp_t* grp;
- ALPM_LOG_FUNC;
+ CALLOC(grp, 1, sizeof(pmgrp_t), return NULL);
+ STRDUP(grp->name, name, free(grp); return NULL);
- CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL));
- STRDUP(grp->name, name, RET_ERR(PM_ERR_MEMORY, NULL));
-
- return(grp);
+ return grp;
}
void _alpm_grp_free(pmgrp_t *grp)
{
- ALPM_LOG_FUNC;
-
if(grp == NULL) {
return;
}
@@ -59,21 +54,14 @@ void _alpm_grp_free(pmgrp_t *grp)
const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp)
{
- ALPM_LOG_FUNC;
-
- /* Sanity checks */
- ASSERT(grp != NULL, return(NULL));
-
+ ASSERT(grp != NULL, return NULL);
return grp->name;
}
alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp)
{
- ALPM_LOG_FUNC;
-
- /* Sanity checks */
- ASSERT(grp != NULL, return(NULL));
-
+ ASSERT(grp != NULL, return NULL);
return grp->packages;
}
+
/* vim: set ts=2 sw=2 noet: */