Remove FREETRANS macro and correctly type _alpm_trans_free

Remove an unnecessary macro, and get rid of the void pointer.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 3c6aebd9..adbddb28 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -386,12 +386,14 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 			}
 
 			if(_alpm_trans_init(tr, PM_TRANS_TYPE_UPGRADE, trans->flags, NULL, NULL, NULL) == -1) {
-				FREETRANS(tr);
+				_alpm_trans_free(tr);
+				tr = NULL;
 				RET_ERR(PM_ERR_TRANS_ABORT, -1);
 			}
 
 			if(_alpm_remove_loadtarget(tr, db, newpkg->name) == -1) {
-				FREETRANS(tr);
+				_alpm_trans_free(tr);
+				tr = NULL;
 				RET_ERR(PM_ERR_TRANS_ABORT, -1);
 			}
 
@@ -413,7 +415,9 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 
 			int ret = _alpm_remove_commit(tr, db);
 
-			FREETRANS(tr);
+			_alpm_trans_free(tr);
+			tr = NULL;
+
 			/* restore our "NoUpgrade" list to previous state */
 			alpm_list_free_inner(handle->noupgrade, free);
 			alpm_list_free(handle->noupgrade);