diff options
| author | Dan McGee <dan@archlinux.org> | 2007-04-27 01:57:09 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-04-27 20:29:23 +0200 |
| commit | db9e10f14215ab6453cd663a62cae5bdfac3d61b (patch) | |
| tree | d94d3af1f79988549f50e6ea52e25da94d3f8125 /lib/libalpm/sync.c | |
| parent | 75efcbbff6a9e1db543f04693f70780413369a85 (diff) | |
| download | pacman-db9e10f14215ab6453cd663a62cae5bdfac3d61b.tar.gz pacman-db9e10f14215ab6453cd663a62cae5bdfac3d61b.tar.xz | |
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>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 4e0a1988..de235d71 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -951,7 +951,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) goto error; } } - FREETRANS(tr); + _alpm_trans_free(tr); + tr = NULL; /* install targets */ _alpm_log(PM_LOG_DEBUG, _("installing packages")); @@ -993,7 +994,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) _alpm_log(PM_LOG_ERROR, _("could not commit transaction")); goto error; } - FREETRANS(tr); + _alpm_trans_free(tr); + tr = NULL; /* propagate replaced packages' requiredby fields to their new owners */ if(replaces) { @@ -1058,7 +1060,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) return(0); error: - FREETRANS(tr); + _alpm_trans_free(tr); + tr = NULL; /* commiting failed, so this is still just a prepared transaction */ trans->state = STATE_PREPARED; return(-1); |