summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/add.c
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-01-07 19:25:28 +0100
committerAurelien Foret <aurelien@archlinux.org>2006-01-07 19:25:28 +0100
commite405204915600340180cef61471471929fb0c275 (patch)
tree1f9aa6460524b97772b95c8b50db358eaa665f27 /lib/libalpm/add.c
parentfce68beaafade3453b89ade29d95e99ac172de01 (diff)
downloadpacman-e405204915600340180cef61471471929fb0c275.tar.gz
pacman-e405204915600340180cef61471471929fb0c275.tar.xz
removed a restriction: the data parameter of XXX_prepare functions can be NULL
Diffstat (limited to 'lib/libalpm/add.c')
-rw-r--r--lib/libalpm/add.c37
1 files changed, 22 insertions, 15 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 8f3d03ce..d683877d 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -196,9 +196,10 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
- ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
- *data = NULL;
+ if(data) {
+ *data = NULL;
+ }
/* Check dependencies
*/
@@ -220,13 +221,15 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
if(!errorout) {
errorout = 1;
}
- if((miss = (pmdepmissing_t *)malloc(sizeof(pmdepmissing_t))) == NULL) {
- FREELIST(lp);
- FREELIST(*data);
- RET_ERR(PM_ERR_MEMORY, -1);
+ if(data) {
+ if((miss = (pmdepmissing_t *)malloc(sizeof(pmdepmissing_t))) == NULL) {
+ FREELIST(lp);
+ FREELIST(*data);
+ RET_ERR(PM_ERR_MEMORY, -1);
+ }
+ *miss = *(pmdepmissing_t*)i->data;
+ *data = pm_list_add(*data, miss);
}
- *miss = *(pmdepmissing_t*)i->data;
- *data = pm_list_add(*data, miss);
}
}
if(errorout) {
@@ -242,13 +245,15 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
if(!errorout) {
errorout = 1;
}
- if((miss = (pmdepmissing_t *)malloc(sizeof(pmdepmissing_t))) == NULL) {
- FREELIST(lp);
- FREELIST(*data);
- RET_ERR(PM_ERR_MEMORY, -1);
+ if(data) {
+ if((miss = (pmdepmissing_t *)malloc(sizeof(pmdepmissing_t))) == NULL) {
+ FREELIST(lp);
+ FREELIST(*data);
+ RET_ERR(PM_ERR_MEMORY, -1);
+ }
+ *miss = *(pmdepmissing_t*)i->data;
+ *data = pm_list_add(*data, miss);
}
- *miss = *(pmdepmissing_t*)i->data;
- *data = pm_list_add(*data, miss);
}
}
FREELIST(lp);
@@ -277,7 +282,9 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
_alpm_log(PM_LOG_FLOW1, "looking for file conflicts");
lp = db_find_conflicts(db, trans->packages, handle->root, &skiplist);
if(lp != NULL) {
- *data = lp;
+ if(data) {
+ *data = lp;
+ }
FREELIST(skiplist);
RET_ERR(PM_ERR_FILE_CONFLICTS, -1);
}