diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-20 06:26:55 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-20 06:26:55 +0000 |
| commit | 7131b7ac87b9793c06d7b7e59df103658dd76ec7 (patch) | |
| tree | d20bcf43f1d93118577c50977ce34cc6340460e1 /lib/libalpm/remove.c | |
| parent | e7f886aac3991b6a12ede9781af741b402dffb64 (diff) | |
| download | pacman-7131b7ac87b9793c06d7b7e59df103658dd76ec7.tar.xz | |
A handful of minor changes:
* Removed the PMList typedef, in favor of the same naming scheme other
structs use 'pmlist_t'
* Added a time stamp on debug output, to make it more informational
* Moved alpm_db_register to _alpm_db_register, making the public function
not take a callback parameter
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index d67807a7..75d01f63 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -92,9 +92,9 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) return(0); } -int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data) +int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, pmlist_t **data) { - PMList *lp; + pmlist_t *lp; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); @@ -107,7 +107,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data) if(lp != NULL) { if(trans->flags & PM_TRANS_FLAG_CASCADE) { while(lp) { - PMList *i; + pmlist_t *i; for(i = lp; i; i = i->next) { pmdepmissing_t *miss = (pmdepmissing_t *)i->data; pmpkg_t *info = _alpm_db_scan(db, miss->depend.name, INFRQ_ALL); @@ -161,7 +161,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) { pmpkg_t *info; struct stat buf; - PMList *targ, *lp; + pmlist_t *targ, *lp; char line[PATH_MAX+1]; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); @@ -230,7 +230,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) * see the big comment block in db_find_conflicts() for an * explanation. */ int skipit = 0; - PMList *j; + pmlist_t *j; for(j = trans->skiplist; j; j = j->next) { if(!strcmp(file, (char*)j->data)) { skipit = 1; @@ -310,7 +310,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) depinfo = _alpm_db_get_pkgfromcache(db, depend.name); if(depinfo == NULL) { /* look for a provides package */ - PMList *provides = _alpm_db_whatprovides(db, depend.name); + pmlist_t *provides = _alpm_db_whatprovides(db, depend.name); if(provides) { /* TODO: should check _all_ packages listed in provides, not just * the first one. |