Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3c7799110c2f4ed458e826f35d10ae5578e19965
commit 3c7799110c2f4ed458e826f35d10ae5578e19965 Author: Michel Hermier <[email protected]> Date: Thu May 1 08:41:57 2014 +0200 libpacman: Remove all PM_PKG_NAME and PM_PKG_VERSION usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index ebb6674..e743a52 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -699,7 +699,7 @@ int _pacman_depcmp(Package *pkg, pmdepend_t *dep) if(dep->mod == PM_DEP_MOD_ANY) { equal = 1; } else { - cmp = _pacman_versioncmp(pkg->getinfo(PM_PKG_VERSION), dep->version); + cmp = _pacman_versioncmp(pkg->version(), dep->version); switch(dep->mod) { case PM_DEP_MOD_EQ: equal = (cmp == 0); break; case PM_DEP_MOD_GE: equal = (cmp >= 0); break; @@ -721,12 +721,12 @@ int _pacman_depcmp(Package *pkg, pmdepend_t *dep) if(!_pacman_strempty(dep->version)) { _pacman_log(PM_LOG_DEBUG, _("depcmp: %s-%s %s %s-%s => %s"), - pkg->getinfo(PM_PKG_NAME), pkg->getinfo(PM_PKG_VERSION), + pkg->name(), pkg->version(), mod, dep->name, dep->version, (equal ? "match" : "no match")); } else { _pacman_log(PM_LOG_DEBUG, _("depcmp: %s-%s %s %s => %s"), - pkg->getinfo(PM_PKG_NAME), pkg->getinfo(PM_PKG_VERSION), + pkg->name(), pkg->version(), mod, dep->name, (equal ? "match" : "no match")); } @@ -768,7 +768,7 @@ int pacman_output_generate(pmlist_t *targets, pmlist_t *dblist) { foundMatch = 0; pkg = db->readpkg(inforeq); while(pkg != NULL) { - char *pname = (char *)pacman_pkg_getinfo(c_cast(pkg), PM_PKG_NAME); + const char *pname = pkg->name(); targets = _pacman_list_remove(targets, (void*) pname, str_cmp, (void **)&match); if(match) { foundMatch = 1; diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 0679966..562d48e 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -193,24 +193,30 @@ int _pacman_trans_event(pmtrans_t *trans, unsigned char event, void *data1, void ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); switch(event) { - case PM_TRANS_EVT_ADD_DONE: - snprintf(str, LOG_STR_LEN, "installed %s (%s)", - (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME), - (char *)pacman_pkg_getinfo(data1, PM_PKG_VERSION)); - pacman_logaction(str); + case PM_TRANS_EVT_ADD_DONE: { + Package *pkg_new = (Package *)data1; + + snprintf(str, LOG_STR_LEN, "installed %s (%s)", + pkg_new->name(), pkg_new->version()); + pacman_logaction(str); + } break; - case PM_TRANS_EVT_REMOVE_DONE: - snprintf(str, LOG_STR_LEN, "removed %s (%s)", - (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME), - (char *)pacman_pkg_getinfo(data1, PM_PKG_VERSION)); - pacman_logaction(str); + case PM_TRANS_EVT_REMOVE_DONE: { + Package *pkg_old = (Package *)data1; + + snprintf(str, LOG_STR_LEN, "removed %s (%s)", + pkg_old->name(), pkg_old->version()); + pacman_logaction(str); + } break; - case PM_TRANS_EVT_UPGRADE_DONE: - snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)", - (char *)pacman_pkg_getinfo(data1, PM_PKG_NAME), - (char *)pacman_pkg_getinfo(data2, PM_PKG_VERSION), - (char *)pacman_pkg_getinfo(data1, PM_PKG_VERSION)); - pacman_logaction(str); + case PM_TRANS_EVT_UPGRADE_DONE: { + Package *pkg_new = (Package *)data1; + Package *pkg_old = (Package *)data2; + + snprintf(str, LOG_STR_LEN, "upgraded %s (%s -> %s)", + pkg_new->name(), pkg_old->version(), pkg_new->version()); + pacman_logaction(str); + } break; default: /* Nothing to log */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
