Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6d19798a07cc8bf72b120f3dcf3f5bdaafdf3c99
commit 6d19798a07cc8bf72b120f3dcf3f5bdaafdf3c99 Author: Michel Hermier <[email protected]> Date: Fri May 16 08:30:41 2014 +0200 libpacman: Now that the dummy transaction in commit was removed, the alternate commit function call can be dropped. diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 1df1527..1c7637c 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1761,11 +1761,6 @@ struct trans_event_table_item { int __pmtrans_t::commit(pmlist_t **data) { - return commit(type, data); -} - -int __pmtrans_t::commit(pmtranstype_t type, pmlist_t **data) -{ Database *db_local; int howmany, remain; pmlist_t *targ, *lp; @@ -1798,6 +1793,7 @@ int __pmtrans_t::commit(pmtranstype_t type, pmlist_t **data) for(targ = packages; targ; targ = targ->next) { Package *pkg_new = NULL, *pkg_local = NULL; void *event_arg0 = NULL, *event_arg1 = NULL; + pmtranstype_t type = this->type; remain = _pacman_list_count(targ); @@ -1807,7 +1803,6 @@ int __pmtrans_t::commit(pmtranstype_t type, pmlist_t **data) if(type & PM_TRANS_TYPE_ADD) { pkg_new = (Package *)targ->data; - type = this->type; } else { pkg_local = (Package *)targ->data; } diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index f9c0235..fd3d104 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -82,7 +82,6 @@ struct __pmtrans_t pmtrans_cbs_t cbs; private: - int commit(pmtranstype_t type, pmlist_t **data); }; #define EVENT(t, e, d1, d2) \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
