bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove trans->skip_add

Browse source 
This is old code that has since gone stale; we no longer ever add
anything to this list so no need to keep it around and check the
contents during extraction.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-02-22 16:48:51 -06:00
parent cfa7602032
commit 6735807c0f
3 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/add.c
View file

@ -185,14 +185,6 @@ static int extract_single_file(struct archive *archive,
return(0); return(0);
} }
/* if a file is in the add skiplist we never extract it */
if(alpm_list_find_str(trans->skip_add, filename)) {
_alpm_log(PM_LOG_DEBUG, "%s is in trans->skip_add, skipping extraction\n",
entryname);
archive_read_data_skip(archive);
return(0);
}
/* Check for file existence. This is one of the more crucial parts /* Check for file existence. This is one of the more crucial parts
* to get 'right'. Here are the possibilities, with the filesystem * to get 'right'. Here are the possibilities, with the filesystem
* on the left and the package on the top: * on the left and the package on the top:

1
lib/libalpm/trans.c
View file

@ -305,7 +305,6 @@ void _alpm_trans_free(pmtrans_t *trans)
alpm_list_free_inner(trans->remove, (alpm_list_fn_free)_alpm_pkg_free); alpm_list_free_inner(trans->remove, (alpm_list_fn_free)_alpm_pkg_free);
alpm_list_free(trans->remove); alpm_list_free(trans->remove);
FREELIST(trans->skip_add);
FREELIST(trans->skip_remove); FREELIST(trans->skip_remove);
FREE(trans); FREE(trans);

1
lib/libalpm/trans.h
View file

@ -41,7 +41,6 @@ struct __pmtrans_t {
pmtransstate_t state; pmtransstate_t state;
alpm_list_t *add; /* list of (pmpkg_t *) */ alpm_list_t *add; /* list of (pmpkg_t *) */
alpm_list_t *remove; /* list of (pmpkg_t *) */ alpm_list_t *remove; /* list of (pmpkg_t *) */
alpm_list_t *skip_add; /* list of (char *) */
alpm_list_t *skip_remove; /* list of (char *) */ alpm_list_t *skip_remove; /* list of (char *) */
alpm_trans_cb_event cb_event; alpm_trans_cb_event cb_event;
alpm_trans_cb_conv cb_conv; alpm_trans_cb_conv cb_conv;