Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7d6b8a64615b2d813777dd63870919c07961bd6e
commit 7d6b8a64615b2d813777dd63870919c07961bd6e Author: Michel Hermier <[email protected]> Date: Wed May 7 09:38:50 2014 +0200 libpacman: s/_pacman_trans_prepare/__pmtrans_t::prepare/ diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 86c2771..4bf1437 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -1180,7 +1180,7 @@ int pacman_trans_prepare(pmlist_t **data) ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); - return(_pacman_trans_prepare(handle->trans, data)); + return handle->trans->prepare(data); } /** Commit a transaction. diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index 0ee4f1a..ea3f3d2 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -645,7 +645,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) } if(replaces) { _pacman_log(PM_LOG_FLOW1, _("removing conflicting and to-be-replaced packages")); - if(_pacman_trans_prepare(tr, data) == -1) { + if(tr->prepare(data) == -1) { _pacman_log(PM_LOG_ERROR, _("could not prepare removal transaction")); goto error; } @@ -684,7 +684,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) spkg->m_reason = PM_PKG_REASON_EXPLICIT; } } - if(_pacman_trans_prepare(tr, data) == -1) { + if(tr->prepare(data) == -1) { _pacman_log(PM_LOG_ERROR, _("could not prepare transaction")); /* pm_errno is set by trans_prepare */ goto error; diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 75c6cd6..4a47838 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -588,41 +588,40 @@ int _pacman_remove_prepare(pmtrans_t *trans, pmlist_t **data) return(0); } -int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t **data) +int __pmtrans_t::prepare(pmlist_t **data) { /* Sanity checks */ - ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); *data = NULL; /* If there's nothing to do, return without complaining */ - if(_pacman_list_empty(trans->packages) && - _pacman_list_empty(trans->syncpkgs)) { + if(_pacman_list_empty(packages) && + _pacman_list_empty(syncpkgs)) { return(0); } - _pacman_trans_compute_triggers(trans); + _pacman_trans_compute_triggers(this); - if(trans->ops != NULL && trans->ops->prepare != NULL) { - if(trans->ops->prepare(trans, data) == -1) { - /* pm_errno is set by trans->ops->prepare() */ + if(ops != NULL && ops->prepare != NULL) { + if(ops->prepare(this, data) == -1) { + /* pm_errno is set by ops->prepare() */ return(-1); } } else { - if(trans->type & PM_TRANS_TYPE_ADD) { - if(_pacman_add_prepare(trans, data) == -1) { + if(type & PM_TRANS_TYPE_ADD) { + if(_pacman_add_prepare(this, data) == -1) { return -1; } } - if(trans->type == PM_TRANS_TYPE_REMOVE) { - if(_pacman_remove_prepare(trans, data) == -1) { + if(type == PM_TRANS_TYPE_REMOVE) { + if(_pacman_remove_prepare(this, data) == -1) { return -1; } } } - _pacman_trans_set_state(trans, STATE_PREPARED); + _pacman_trans_set_state(this, STATE_PREPARED); return(0); } diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index d3a6aaf..d148f73 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -67,6 +67,8 @@ struct __pmtrans_t pmsyncpkg_t *find(const char *pkgname) const; + int prepare(pmlist_t **data); + const pmtrans_ops_t *ops; int (*set_state)(pmtrans_t *trans, int new_state); libpacman::Handle *handle; @@ -104,7 +106,6 @@ pmsyncpkg_t *_pacman_trans_add(pmtrans_t *trans, pmsyncpkg_t *syncpkg, int flags int _pacman_trans_add_package(pmtrans_t *trans, pmpkg_t *pkg, pmtranstype_t type, int flags); pmsyncpkg_t *_pacman_trans_add_target(pmtrans_t *trans, const char *target, pmtranstype_t type, int flags); int _pacman_trans_addtarget(pmtrans_t *trans, const char *target); -int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t **data); int _pacman_trans_commit(pmtrans_t *trans, pmlist_t **data); int _pacman_trans_sysupgrade(pmtrans_t *trans); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
