diff options
| author | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:39 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:39 +0200 |
| commit | afc96f2ab3d05f14a73e81f871164f01423b5572 (patch) | |
| tree | 16ff0c0f2390b51ed43cfaa1a9ec508678793ec6 /lib/libalpm/remove.c | |
| parent | bd88a8d5511c24db55dd2a5c04161918571dbfbd (diff) | |
| download | pacman-afc96f2ab3d05f14a73e81f871164f01423b5572.tar.gz pacman-afc96f2ab3d05f14a73e81f871164f01423b5572.tar.xz | |
Prefix _alpm_errno_t members with ALPM
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a90cd13a..2d6fcf64 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -51,17 +51,17 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) /* Sanity checks */ CHECK_HANDLE(handle, return -1); - ASSERT(pkg != NULL, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1)); - ASSERT(handle == pkg->handle, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1)); + ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + ASSERT(handle == pkg->handle, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); trans = handle->trans; - ASSERT(trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, -1)); + ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); ASSERT(trans->state == STATE_INITIALIZED, - RET_ERR(handle, PM_ERR_TRANS_NOT_INITIALIZED, -1)); + RET_ERR(handle, ALPM_ERR_TRANS_NOT_INITIALIZED, -1)); pkgname = pkg->name; if(_alpm_pkg_find(trans->remove, pkgname)) { - RET_ERR(handle, PM_ERR_TRANS_DUP_TARGET, -1); + RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); } _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s to the transaction remove list\n", @@ -166,7 +166,7 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(lp); } - RET_ERR(handle, PM_ERR_UNSATISFIED_DEPS, -1); + RET_ERR(handle, ALPM_ERR_UNSATISFIED_DEPS, -1); } } } @@ -321,7 +321,7 @@ int _alpm_upgraderemove_package(alpm_handle_t *handle, if(!can_remove_file(handle, lp->data, skip_remove)) { _alpm_log(handle, ALPM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", pkgname); - RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1); + RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); } filenum++; } @@ -397,7 +397,7 @@ int _alpm_remove_packages(alpm_handle_t *handle) if(!can_remove_file(handle, lp->data, NULL)) { _alpm_log(handle, ALPM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", pkgname); - RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1); + RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); } filenum++; } |