From eeb38ef677a1a08089222f6553a70ca7306503ea Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 28 Apr 2007 19:56:29 -0400 Subject: Remove 'removes' array from libalpm We don't use this functionality for now, so get rid of it and the functions associated with it. Signed-off-by: Dan McGee --- lib/libalpm/add.c | 19 +------------------ lib/libalpm/alpm.h | 3 --- lib/libalpm/package.c | 18 ------------------ lib/libalpm/package.h | 1 - src/pacman/callback.c | 4 ---- src/pacman/package.c | 2 -- 6 files changed, 1 insertion(+), 46 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 9c08db86..49385f4f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -172,9 +172,6 @@ error: int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) { alpm_list_t *lp = NULL, *i = NULL; - alpm_list_t *rmlist = NULL; - char rm_fname[PATH_MAX]; - pmpkg_t *info = NULL; ALPM_LOG_FUNC; @@ -255,21 +252,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL); } - /* Cleaning up - */ - EVENT(trans, PM_TRANS_EVT_CLEANUP_START, NULL, NULL); - _alpm_log(PM_LOG_DEBUG, _("cleaning up")); - for (lp=trans->packages; lp!=NULL; lp=lp->next) { - info=(pmpkg_t *)lp->data; - for (rmlist = alpm_pkg_get_removes(info); rmlist; rmlist = rmlist->next) { - snprintf(rm_fname, PATH_MAX, "%s%s", handle->root, (char *)rmlist->data); - remove(rm_fname); - } - } - EVENT(trans, PM_TRANS_EVT_CLEANUP_DONE, NULL, NULL); - - /* Check for file conflicts - */ + /* Check for file conflicts */ if(!(trans->flags & PM_TRANS_FLAG_FORCE)) { EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 44c7e10f..e2d2b0e1 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -220,7 +220,6 @@ pmpkgreason_t alpm_pkg_get_reason(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_licenses(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_groups(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_depends(pmpkg_t *pkg); -alpm_list_t *alpm_pkg_get_removes(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_requiredby(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_conflicts(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_provides(pmpkg_t *pkg); @@ -285,8 +284,6 @@ typedef enum _pmtransevt_t { PM_TRANS_EVT_CHECKDEPS_DONE, PM_TRANS_EVT_FILECONFLICTS_START, PM_TRANS_EVT_FILECONFLICTS_DONE, - PM_TRANS_EVT_CLEANUP_START, - PM_TRANS_EVT_CLEANUP_DONE, PM_TRANS_EVT_RESOLVEDEPS_START, PM_TRANS_EVT_RESOLVEDEPS_DONE, PM_TRANS_EVT_INTERCONFLICTS_START, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index a47ae2fc..246612c5 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -90,7 +90,6 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) newpkg->files = alpm_list_strdup(alpm_pkg_get_files(pkg)); newpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(pkg)); newpkg->depends = alpm_list_strdup(alpm_pkg_get_depends(pkg)); - newpkg->removes = alpm_list_strdup(alpm_pkg_get_removes(pkg)); newpkg->groups = alpm_list_strdup(alpm_pkg_get_groups(pkg)); newpkg->provides = alpm_list_strdup(alpm_pkg_get_provides(pkg)); newpkg->replaces = alpm_list_strdup(alpm_pkg_get_replaces(pkg)); @@ -113,7 +112,6 @@ void _alpm_pkg_free(pmpkg_t *pkg) FREELIST(pkg->files); FREELIST(pkg->backup); FREELIST(pkg->depends); - FREELIST(pkg->removes); FREELIST(pkg->conflicts); FREELIST(pkg->requiredby); FREELIST(pkg->groups); @@ -262,8 +260,6 @@ static int parse_descfile(const char *descfile, pmpkg_t *info) info->isize = atol(ptr); } else if(!strcmp(key, "DEPEND")) { info->depends = alpm_list_add(info->depends, strdup(ptr)); - } else if(!strcmp(key, "REMOVE")) { - info->removes = alpm_list_add(info->removes, strdup(ptr)); } else if(!strcmp(key, "CONFLICT")) { info->conflicts = alpm_list_add(info->conflicts, strdup(ptr)); } else if(!strcmp(key, "REPLACES")) { @@ -852,20 +848,6 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_depends(pmpkg_t *pkg) return pkg->depends; } -alpm_list_t SYMEXPORT *alpm_pkg_get_removes(pmpkg_t *pkg) -{ - ALPM_LOG_FUNC; - - /* Sanity checks */ - ASSERT(handle != NULL, return(NULL)); - ASSERT(pkg != NULL, return(NULL)); - - if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); - } - return pkg->removes; -} - alpm_list_t SYMEXPORT *alpm_pkg_get_requiredby(pmpkg_t *pkg) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 212b7a69..fda10800 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -77,7 +77,6 @@ struct __pmpkg_t { alpm_list_t *files; alpm_list_t *backup; alpm_list_t *depends; - alpm_list_t *removes; alpm_list_t *requiredby; alpm_list_t *conflicts; alpm_list_t *provides; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 8654b4ef..be209b44 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -171,9 +171,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) printf(_("checking for file conflicts... ")); } break; - case PM_TRANS_EVT_CLEANUP_START: - printf(_("cleaning up... ")); - break; case PM_TRANS_EVT_RESOLVEDEPS_START: printf(_("resolving dependencies... ")); break; @@ -186,7 +183,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) } break; case PM_TRANS_EVT_CHECKDEPS_DONE: - case PM_TRANS_EVT_CLEANUP_DONE: case PM_TRANS_EVT_RESOLVEDEPS_DONE: case PM_TRANS_EVT_INTERCONFLICTS_DONE: printf(_("done.\n")); diff --git a/src/pacman/package.c b/src/pacman/package.c index 65045a53..03c2d88c 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -75,7 +75,6 @@ void dump_pkg_full(pmpkg_t *pkg, int level) list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); - list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); /* Only applicable if installed */ if(level > 0) { list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); @@ -128,7 +127,6 @@ void dump_pkg_sync(pmpkg_t *pkg, const char *treename) list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); - list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); printf(_("Download Size : %6.2f K\n"), (float)alpm_pkg_get_size(pkg) / 1024.0); -- cgit v1.2.3-24-g4f1b