diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2005-03-16 23:10:05 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2005-03-16 23:10:05 +0100 |
| commit | d10955065632a67fcad70e32d36eeb80b1045299 (patch) | |
| tree | 2d98ecf56658420459eaf6a80d1864600e06ad36 /lib/libalpm/trans.c | |
| parent | 04e195284e0439436143a297a561aef1a6c35b17 (diff) | |
| download | pacman-d10955065632a67fcad70e32d36eeb80b1045299.tar.gz pacman-d10955065632a67fcad70e32d36eeb80b1045299.tar.xz | |
Renamed PM_RET_ERR to RET_ERR (no need for a PM_ prefix for internal
defines).
Diffstat (limited to 'lib/libalpm/trans.c')
| -rw-r--r-- | lib/libalpm/trans.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 1aaca0e4..7bd37e1f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -70,7 +70,7 @@ int trans_init(pmtrans_t *trans, unsigned char type, unsigned char flags, alpm_t { /* Sanity checks */ if(trans == NULL) { - PM_RET_ERR(PM_ERR_TRANS_NULL, -1); + RET_ERR(PM_ERR_TRANS_NULL, -1); } /* ORE @@ -88,11 +88,11 @@ int trans_init(pmtrans_t *trans, unsigned char type, unsigned char flags, alpm_t int trans_addtarget(pmtrans_t *trans, char *target) { /* Sanity checks */ - ASSERT(trans != NULL, PM_RET_ERR(PM_ERR_TRANS_NULL, -1)); - ASSERT(target != NULL, PM_RET_ERR(PM_ERR_WRONG_ARGS, -1)); + ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); + ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); if(pm_list_is_strin(target, trans->targets)) { - PM_RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); + RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } switch(trans->type) { @@ -121,7 +121,7 @@ int trans_prepare(pmtrans_t *trans, PMList **data) *data = NULL; /* Sanity checks */ - ASSERT(trans != NULL, PM_RET_ERR(PM_ERR_WRONG_ARGS, -1)); + ASSERT(trans != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(trans->packages != NULL, return(0)); @@ -155,7 +155,7 @@ int trans_prepare(pmtrans_t *trans, PMList **data) int trans_commit(pmtrans_t *trans) { /* Sanity checks */ - ASSERT(trans != NULL, PM_RET_ERR(PM_ERR_WRONG_ARGS, -1)); + ASSERT(trans != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); /* If there's nothing to do, return without complaining */ ASSERT(trans->packages != NULL, return(0)); |