From 1799afc9c144381150e181cee3a03a506b3e1d31 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 30 Jan 2007 03:46:33 +0000 Subject: Discussed on IRC for a bit, this makes the following changes for clarity: * alpm_list_is_in --> alpm_list_find * alpm_list_is_strin --> alpm_list_find_str * Flip parameters of both functions to be inline with rest of alpm_list. First commit, woohoo. --- lib/libalpm/conflict.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/libalpm/conflict.c') diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 58ffb726..0191a187 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -240,7 +240,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, a if(strcmp(filestr, ".INSTALL") == 0) { continue; } - if(alpm_list_is_strin(filestr, p2->files)) { + if(alpm_list_find_str(p2->files, filestr)) { pmconflict_t *conflict = malloc(sizeof(pmconflict_t)); if(conflict == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"), @@ -284,7 +284,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, a _alpm_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name); _alpm_db_read(db, INFRQ_FILES, dbpkg); } - if(dbpkg && alpm_list_is_strin(j->data, dbpkg->files)) { + if(dbpkg && alpm_list_find_str(dbpkg->files, j->data)) { ok = 1; } /* Make sure that the supposedly-conflicting file is not actually just @@ -315,7 +315,8 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, a _alpm_db_read(db, INFRQ_FILES, dbpkg2); } /* If it used to exist in there, but doesn't anymore */ - if(dbpkg2 && !alpm_list_is_strin(filestr, p1->files) && alpm_list_is_strin(filestr, dbpkg2->files)) { + if(dbpkg2 && !alpm_list_find_str(p1->files, filestr) + && alpm_list_find_str(dbpkg2->files, filestr)) { ok = 1; /* Add to the "skip list" of files that we shouldn't remove during an upgrade. * -- cgit v1.2.3-24-g4f1b