Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ad642c5fb740dcd673753bbdbca876e128ef9d6c
commit ad642c5fb740dcd673753bbdbca876e128ef9d6c Author: Michel Hermier <[email protected]> Date: Thu Nov 7 17:12:23 2013 +0100 libpacman: s/info/pkg_new/ s/local/pkg_local/ at various place to make code more explicit. diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index e0bb698..9d21197 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -77,9 +77,8 @@ pmpkg_t *_pacman_filedb_load(pmdb_t *db, const char *name) int _pacman_add_addtarget(pmtrans_t *trans, const char *name) { - pmpkg_t *info = NULL; pmlist_t *i; - pmpkg_t *local; + pmpkg_t *pkg_new, *pkg_local; pmdb_t *db_local = trans->handle->db_local; ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); @@ -91,23 +90,23 @@ int _pacman_add_addtarget(pmtrans_t *trans, const char *name) return(_pacman_fakedb_addtarget(trans, name)); } - info = _pacman_filedb_load(NULL, name); - if(info == NULL || _pacman_pkg_is_valid(info, trans, name) != 0) { + pkg_new = _pacman_filedb_load(NULL, name); + if(pkg_new == NULL || _pacman_pkg_is_valid(pkg_new, trans, name) != 0) { /* pm_errno is already set by _pacman_filedb_load() */ goto error; } - local = _pacman_db_get_pkgfromcache(db_local, info->name); + pkg_local = _pacman_db_get_pkgfromcache(db_local, pkg_new->name); if(trans->type != PM_TRANS_TYPE_UPGRADE) { /* only install this package if it is not already installed */ - if(local != NULL) { + if(pkg_local != NULL) { pm_errno = PM_ERR_PKG_INSTALLED; goto error; } } else { if(trans->flags & PM_TRANS_FLAG_FRESHEN) { /* only upgrade/install this package if it is already installed and at a lesser version */ - if(local == NULL || _pacman_versioncmp(local->version, info->version) >= 0) { + if(pkg_local == NULL || _pacman_versioncmp(pkg_local->version, pkg_new->version) >= 0) { pm_errno = PM_ERR_PKG_CANT_FRESH; goto error; } @@ -118,36 +117,36 @@ int _pacman_add_addtarget(pmtrans_t *trans, const char *name) * if so, replace it in the list */ for(i = trans->packages; i; i = i->next) { pmpkg_t *pkg = i->data; - if(strcmp(pkg->name, info->name) == 0) { - if(_pacman_versioncmp(pkg->version, info->version) < 0) { + if(strcmp(pkg->name, pkg_new->name) == 0) { + if(_pacman_versioncmp(pkg->version, pkg_new->version) < 0) { _pacman_log(PM_LOG_WARNING, _("replacing older version %s-%s by %s in target list"), - pkg->name, pkg->version, info->version); - _pacman_ptrswap(&i->data, &info); + pkg->name, pkg->version, pkg_new->version); + _pacman_ptrswap(&i->data, &pkg_new); } else { _pacman_log(PM_LOG_WARNING, _("newer version %s-%s is in the target list -- skipping"), - pkg->name, pkg->version, info->version); + pkg->name, pkg->version, pkg_new->version); } - FREEPKG(info); + FREEPKG(pkg_new); return(0); } } if(trans->flags & PM_TRANS_FLAG_ALLDEPS) { - info->reason = PM_PKG_REASON_DEPEND; + pkg_new->reason = PM_PKG_REASON_DEPEND; } /* copy over the install reason */ - if(local) { - info->reason = (long)_pacman_pkg_getinfo(local, PM_PKG_REASON); + if(pkg_local) { + pkg_new->reason = (long)_pacman_pkg_getinfo(pkg_local, PM_PKG_REASON); } /* add the package to the transaction */ - trans->packages = _pacman_list_add(trans->packages, info); + trans->packages = _pacman_list_add(trans->packages, pkg_new); return(0); error: - FREEPKG(info); + FREEPKG(pkg_new); return(-1); } diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c index ec8e414..ef7e69f 100644 --- a/lib/libpacman/remove.c +++ b/lib/libpacman/remove.c @@ -61,7 +61,7 @@ int _pacman_remove_addtarget(pmtrans_t *trans, const char *name) { - pmpkg_t *info; + pmpkg_t *pkg_local; pmdb_t *db_local = trans->handle->db_local; ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); @@ -72,22 +72,22 @@ int _pacman_remove_addtarget(pmtrans_t *trans, const char *name) RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } - if((info = _pacman_db_scan(db_local, name, INFRQ_ALL)) == NULL) { + if((pkg_local = _pacman_db_scan(db_local, name, INFRQ_ALL)) == NULL) { _pacman_log(PM_LOG_ERROR, _("could not find %s in database"), name); RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } /* ignore holdpkgs on upgrade */ - if((trans == handle->trans) && _pacman_list_is_strin(info->name, handle->holdpkg)) { + if((trans == handle->trans) && _pacman_list_is_strin(pkg_local->name, handle->holdpkg)) { int resp = 0; - QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, info, NULL, NULL, &resp); + QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, pkg_local, NULL, NULL, &resp); if(!resp) { RET_ERR(PM_ERR_PKG_HOLD, -1); } } - _pacman_log(PM_LOG_FLOW2, _("adding %s in the targets list"), info->name); - trans->packages = _pacman_list_add(trans->packages, info); + _pacman_log(PM_LOG_FLOW2, _("adding %s in the targets list"), pkg_local->name); + trans->packages = _pacman_list_add(trans->packages, pkg_local); return(0); } diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index 4e70e6e..23d6ebb 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -113,7 +113,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) char targline[PKG_FULLNAME_LEN]; char *targ; pmlist_t *j; - pmpkg_t *local; + pmpkg_t *pkg_local; pmpkg_t *spkg = NULL; pmsyncpkg_t *ps; int cmp; @@ -171,23 +171,23 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } - local = _pacman_db_get_pkgfromcache(db_local, spkg->name); - if(local) { - cmp = _pacman_versioncmp(local->version, spkg->version); + pkg_local = _pacman_db_get_pkgfromcache(db_local, spkg->name); + if(pkg_local) { + cmp = _pacman_versioncmp(pkg_local->version, spkg->version); if(cmp > 0) { - /* local version is newer -- get confirmation before adding */ + /* pkg_local version is newer -- get confirmation before adding */ int resp = 0; - QUESTION(trans, PM_TRANS_CONV_LOCAL_NEWER, local, NULL, NULL, &resp); + QUESTION(trans, PM_TRANS_CONV_LOCAL_NEWER, pkg_local, NULL, NULL, &resp); if(!resp) { - _pacman_log(PM_LOG_WARNING, _("%s-%s: local version is newer -- skipping"), local->name, local->version); + _pacman_log(PM_LOG_WARNING, _("%s-%s: local version is newer -- skipping"), pkg_local->name, pkg_local->version); return(0); } } else if(cmp == 0) { /* versions are identical -- get confirmation before adding */ int resp = 0; - QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp); + QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, pkg_local, NULL, NULL, &resp); if(!resp) { - _pacman_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"), local->name, local->version); + _pacman_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"), pkg_local->name, pkg_local->version); return(0); } } @@ -196,8 +196,8 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) /* add the package to the transaction */ if(!find_pkginsync(spkg->name, trans->packages)) { pmpkg_t *dummy = NULL; - if(local) { - dummy = _pacman_pkg_new(local->name, local->version); + if(pkg_local) { + dummy = _pacman_pkg_new(pkg_local->name, pkg_local->version); if(dummy == NULL) { RET_ERR(PM_ERR_MEMORY, -1); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
