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/add.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/libalpm/add.c') diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 38c0c9aa..678da620 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -507,7 +507,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) * eg, /home/httpd/html/index.html may be removed so index.php * could be used. */ - if(alpm_list_is_strin(pathname, handle->noextract)) { + if(alpm_list_find_str(handle->noextract, pathname)) { alpm_logaction(_("notice: %s is in NoExtract -- skipping extraction"), pathname); archive_read_data_skip (archive); continue; @@ -516,7 +516,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) if(!stat(expath, &buf) && !S_ISDIR(buf.st_mode)) { /* file already exists */ if(!pmo_upgrade || oldpkg == NULL) { - nb = alpm_list_is_strin(pathname, info->backup); + nb = alpm_list_find_str(info->backup, pathname); } else { /* op == PM_TRANS_TYPE_UPGRADE */ md5_orig = _alpm_needbackup(pathname, oldpkg->backup); @@ -525,7 +525,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) nb = 1; } } - if(alpm_list_is_strin(pathname, handle->noupgrade)) { + if(alpm_list_find_str(handle->noupgrade, pathname)) { notouch = 1; nb = 0; } -- cgit v1.2.3-54-g00ecf