diff options
author | Aaron Griffin <aaron@archlinux.org> | 2007-01-19 09:28:44 +0000 |
---|---|---|
committer | Aaron Griffin <aaron@archlinux.org> | 2007-01-19 09:28:44 +0000 |
commit | 616701726425417989ef1dca145b805deae6fe93 (patch) | |
tree | 2da68e080703c61a2c2116c0346b2dd58025015f /lib/libalpm/trans.c | |
parent | 6d6ab5ed188d98fa057dbe2c83e8ce5126854426 (diff) | |
download | pacman-616701726425417989ef1dca145b805deae6fe93.tar.xz |
Preliminary checkin for alpm_list conversion
* renamed pmlist_t -> alpm_list_t
* made alpm_list_t a public type (alpm_list.h header)
* removed additional storage for registered DBs in pacman source
* some code cleanup
* removed duplicate (pm)list_display functions from pacman source
* misc code cleanup
Diffstat (limited to 'lib/libalpm/trans.c')
-rw-r--r-- | lib/libalpm/trans.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 8def650f..20425b63 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -32,7 +32,7 @@ #include "package.h" #include "util.h" #include "log.h" -#include "list.h" +#include "alpm_list.h" #include "handle.h" #include "add.h" #include "remove.h" @@ -71,7 +71,7 @@ void _alpm_trans_free(void *data) FREELIST(trans->targets); if(trans->type == PM_TRANS_TYPE_SYNC) { - pmlist_t *i; + alpm_list_t *i; for(i = trans->packages; i; i = i->next) { FREESYNC(i->data); } @@ -114,7 +114,7 @@ int _alpm_trans_addtarget(pmtrans_t *trans, char *target) ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(_alpm_list_is_strin(target, trans->targets)) { + if(alpm_list_is_strin(target, trans->targets)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } @@ -140,12 +140,12 @@ int _alpm_trans_addtarget(pmtrans_t *trans, char *target) break; } - trans->targets = _alpm_list_add(trans->targets, strdup(target)); + trans->targets = alpm_list_add(trans->targets, strdup(target)); return(0); } -int _alpm_trans_prepare(pmtrans_t *trans, pmlist_t **data) +int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data) { *data = NULL; @@ -184,7 +184,7 @@ int _alpm_trans_prepare(pmtrans_t *trans, pmlist_t **data) return(0); } -int _alpm_trans_commit(pmtrans_t *trans, pmlist_t **data) +int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data) { if(data!=NULL) *data = NULL; @@ -244,7 +244,7 @@ unsigned int alpm_trans_get_flags() return handle->trans->flags; } -pmlist_t * alpm_trans_get_targets() +alpm_list_t * alpm_trans_get_targets() { /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); @@ -253,7 +253,7 @@ pmlist_t * alpm_trans_get_targets() return handle->trans->targets; } -pmlist_t * alpm_trans_get_packages() +alpm_list_t * alpm_trans_get_packages() { /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); |