Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2c8cfbfc6cd25d2befd1d97a159c76295bcec1cc
commit 2c8cfbfc6cd25d2befd1d97a159c76295bcec1cc Author: Michel Hermier <[email protected]> Date: Mon May 12 13:51:15 2014 +0200 libpacman: Simplify _pacman_db_find_conflicts arguments. diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 59d233e..e30c439 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -256,7 +256,7 @@ static pmlist_t *chk_fileconflicts(pmlist_t *filesA, pmlist_t *filesB) return(ret); } -pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **skip_list) +pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans) { pmlist_t *i, *j, *k; char *filestr = NULL; @@ -268,6 +268,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski double percent; int howmany, remain; Database *db_local = trans->handle->db_local; + const char *root = trans->handle->root; if(db_local == NULL || targets == NULL || root == NULL) { return(NULL); @@ -359,7 +360,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski * Our workaround is to scan through all "old" packages and all "new" * ones, looking for files that jump to different packages. */ - *skip_list = _pacman_stringlist_append(*skip_list, filestr); + trans->skiplist = _pacman_stringlist_append(trans->skiplist, filestr); } } } diff --git a/lib/libpacman/conflict.h b/lib/libpacman/conflict.h index b92fbc7..9723f20 100644 --- a/lib/libpacman/conflict.h +++ b/lib/libpacman/conflict.h @@ -34,7 +34,7 @@ struct __pmconflict_t { }; pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages); -pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **skip_list); +pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans); #endif /* _PACMAN_CONFLICT_H */ diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 84e1329..eec643f 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1367,25 +1367,18 @@ cleanup: /* Check for file conflicts */ if(!(flags & PM_TRANS_FLAG_FORCE)) { - pmlist_t *skiplist = NULL; - EVENT(this, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL); _pacman_log(PM_LOG_FLOW1, _("looking for file conflicts")); - lp = _pacman_db_find_conflicts(this, handle->root, &skiplist); + lp = _pacman_db_find_conflicts(this); if(lp != NULL) { if(data) { *data = lp; } else { FREELIST(lp); } - FREELIST(skiplist); RET_ERR(PM_ERR_FILE_CONFLICTS, -1); } - - /* copy the file skiplist into the transaction */ - skiplist = skiplist; - EVENT(this, PM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
