diff options
author | Jonathan Conder <jonno.conder@gmail.com> | 2011-10-29 15:03:24 +1300 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-11-14 08:54:03 -0600 |
commit | a3f9399295e6c94b7f8f8249d4a6b28e63fd2dbb (patch) | |
tree | 6d72f08e73177a8f33661387e4381126db4f2dba /src | |
parent | 1de5070bb39e56ee9ce381b0cc40752eaed60783 (diff) |
create a typedef for enum _alpm_errno_t
This is consistent with the other enums and structs, and should be
slightly more readable.
Signed-off-by: Jonathan Conder <jonno.conder@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/pacman/callback.c | 2 | ||||
-rw-r--r-- | src/pacman/conf.c | 2 | ||||
-rw-r--r-- | src/pacman/remove.c | 2 | ||||
-rw-r--r-- | src/pacman/sync.c | 6 | ||||
-rw-r--r-- | src/pacman/util.c | 2 | ||||
-rw-r--r-- | src/util/cleanupdelta.c | 2 | ||||
-rw-r--r-- | src/util/pactree.c | 2 | ||||
-rw-r--r-- | src/util/testdb.c | 2 | ||||
-rw-r--r-- | src/util/testpkg.c | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 14d80486..3dd9292b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -341,7 +341,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, *response = yesno(_(":: File %s is corrupted (%s).\n" "Do you want to delete it?"), (char *)data1, - alpm_strerror(*(enum _alpm_errno_t *)data2)); + alpm_strerror(*(alpm_errno_t *)data2)); break; case ALPM_QUESTION_IMPORT_KEY: { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 69562067..5328e7cc 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -525,7 +525,7 @@ static int _add_mirror(alpm_db_t *db, char *value) static int setup_libalpm(void) { int ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; alpm_handle_t *handle; pm_printf(ALPM_LOG_DEBUG, "setup_libalpm called\n"); diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 73a583c9..f56c1ec1 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -110,7 +110,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 2: prepare the transaction based on its type, targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index cc702031..1003a421 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -600,7 +600,7 @@ static int process_pkg(alpm_pkg_t *pkg) int ret = alpm_add_pkg(config->handle, pkg); if(ret == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); if(err == ALPM_ERR_TRANS_DUP_TARGET || err == ALPM_ERR_PKG_IGNORED) { /* just skip duplicate or ignored targets */ @@ -766,7 +766,7 @@ int sync_prepare_execute(void) /* Step 2: "compute" the transaction based on targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { @@ -835,7 +835,7 @@ int sync_prepare_execute(void) } if(alpm_trans_commit(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerror(err)); switch(err) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 42f17eac..c0dcb9f2 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -65,7 +65,7 @@ int trans_init(alpm_transflag_t flags, int check_valid) void trans_init_error(void) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), alpm_strerror(err)); if(err == ALPM_ERR_HANDLE_LOCK) { diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 7964609e..d6bd0e86 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -94,7 +94,7 @@ static void usage(void) { int main(int argc, char *argv[]) { const char *dbpath = DBPATH; - enum _alpm_errno_t err; + alpm_errno_t err; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/pactree.c b/src/util/pactree.c index bb15b1bb..f95c5e89 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -443,7 +443,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) int main(int argc, char *argv[]) { int freelist = 0, ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; const char *target_name; alpm_pkg_t *pkg; alpm_list_t *dblist = NULL; diff --git a/src/util/testdb.c b/src/util/testdb.c index 783d4993..b15bbe5e 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -185,7 +185,7 @@ static void usage(void) int main(int argc, char *argv[]) { int ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; const char *dbpath = DBPATH; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 90758e16..6385e417 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) { int retval = 1; /* default = false */ alpm_handle_t *handle; - enum _alpm_errno_t err; + alpm_errno_t err; alpm_pkg_t *pkg = NULL; const alpm_siglevel_t level = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; |