diff options
| author | Dan McGee <dan@archlinux.org> | 2011-02-17 02:10:53 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-02-17 03:57:07 +0100 |
| commit | 00c393d49ff77bb85397278b8f4bd89450402806 (patch) | |
| tree | 00990e99812feaba4de1174f7f464c2ae6e2b697 /lib/libalpm/conflict.h | |
| parent | d1cc1ef6c31dc193adcf48a9aea4a95830c7ae56 (diff) | |
| download | pacman-00c393d49ff77bb85397278b8f4bd89450402806.tar.gz pacman-00c393d49ff77bb85397278b8f4bd89450402806.tar.xz | |
Conflict checking code cleanup
* Make conflict_isin() static; it is used nowhere else.
* Remove does_conflict(): it turns out to be replaceable by a single call to
_alpm_depcmp(). By pushing it up, we can reduce calls to _alpm_splitdep()
from 60,368 to 16,940 during one test -Su operation I ran.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 09b4f99b..418d3f61 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -40,7 +40,6 @@ struct __pmfileconflict_t { pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason); pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict); void _alpm_conflict_free(pmconflict_t *conflict); -int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack); alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages); alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages); alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, |