Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0a779537c5b97258454acc6844bbe3490f11cbb2
commit 0a779537c5b97258454acc6844bbe3490f11cbb2 Author: Michel Hermier <[email protected]> Date: Wed May 7 08:28:23 2014 +0200 libpacman: Remove FREETRANS. diff --git a/lib/libpacman/handle.cpp b/lib/libpacman/handle.cpp index a199350..bec817f 100644 --- a/lib/libpacman/handle.cpp +++ b/lib/libpacman/handle.cpp @@ -96,7 +96,7 @@ Handle::~Handle() } /* free memory */ - FREETRANS(trans); + delete trans; FREE(root); FREE(dbpath); FREE(cachedir); diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index 9266533..c69945b 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -661,7 +661,8 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) goto error; } } - FREETRANS(tr); + delete tr; + tr = NULL; /* install targets */ _pacman_log(PM_LOG_FLOW1, _("installing packages")); @@ -697,7 +698,8 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) _pacman_log(PM_LOG_ERROR, _("could not commit transaction")); goto error; } - FREETRANS(tr); + delete tr; + tr = NULL; /* propagate replaced packages' requiredby fields to their new owners */ if(replaces) { @@ -751,7 +753,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) return(0); error: - FREETRANS(tr); + delete tr; /* commiting failed, so this is still just a prepared transaction */ return(-1); } diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index c266b02..fc127ec 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1093,16 +1093,16 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) RET_ERR(PM_ERR_TRANS_ABORT, -1); } if(_pacman_remove_addtarget(tr, pkg_new->name()) == -1) { - FREETRANS(tr); + delete tr; RET_ERR(PM_ERR_TRANS_ABORT, -1); } /* copy the skiplist over */ tr->skiplist = _pacman_list_strdup(trans->skiplist); if(_pacman_remove_commit(tr, NULL) == -1) { - FREETRANS(tr); + delete tr; RET_ERR(PM_ERR_TRANS_ABORT, -1); } - FREETRANS(tr); + delete tr; } _pacman_log(PM_LOG_FLOW1, _("adding new package %s-%s"), pkg_new->name(), pkg_new->version()); } else { diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 6e9bbe7..460b2d0 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -79,11 +79,6 @@ struct __pmtrans_t pmtrans_cbs_t cbs; }; -#define FREETRANS(p) \ -do { \ - delete (p); \ - (p) = NULL; \ -} while (0) #define EVENT(t, e, d1, d2) \ _pacman_trans_event((t), (e), (d1), (d2)) #define QUESTION(_t, q, d1, d2, d3, r) \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
