Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=77b1e19a541b674f38dadd486ce9887ec96d86aa
commit 77b1e19a541b674f38dadd486ce9887ec96d86aa Author: Michel Hermier <[email protected]> Date: Sun May 11 09:34:16 2014 +0200 libpacman: s/_pacman_trans_add_package/__pmtrans_t::add/g diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index f9bb6e2..7a4e93a 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -265,13 +265,12 @@ pmsyncpkg_t *__pmtrans_t::add(pmsyncpkg_t *syncpkg, int flags) return syncpkg; } -int _pacman_trans_add_package(pmtrans_t *trans, Package *pkg, pmtranstype_t type, int flags) +int __pmtrans_t::add(Package *pkg, pmtranstype_t type, int flags) { - ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); _pacman_log(PM_LOG_FLOW2, _("adding %s in the targets list"), pkg->name()); - trans->packages = _pacman_list_add(trans->packages, pkg); + packages = _pacman_list_add(packages, pkg); return 0; } @@ -325,7 +324,7 @@ int _pacman_remove_addtarget(pmtrans_t *trans, const char *name) } } - return _pacman_trans_add_package(trans, pkg_local, trans->type, 0); + return trans->add(pkg_local, trans->type, 0); } int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) @@ -408,7 +407,7 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) } delete pkg_new; } else { - _pacman_trans_add_package(trans, pkg_new, trans->type, 0); + trans->add(pkg_new, trans->type, 0); } } if(trans->type == PM_TRANS_TYPE_REMOVE) { diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 6d991f8..102ad9e 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -33,6 +33,7 @@ typedef struct __pmtrans_t pmtrans_t; namespace libpacman { class Handle; +class Package; } @@ -71,6 +72,7 @@ struct __pmtrans_t int commit(pmlist_t **data); pmsyncpkg_t *add(pmsyncpkg_t *syncpkg, int flags); + int add(libpacman::Package *pkg, pmtranstype_t type, int flags); const pmtrans_ops_t *ops; int (*set_state)(pmtrans_t *trans, int new_state); @@ -105,7 +107,6 @@ do { \ int _pacman_trans_event(pmtrans_t *trans, unsigned char, void *, void *); -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); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
