diff options
| author | Stefano Esposito <stefano.esposito87@gmail.com> | 2007-09-08 18:41:45 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-09-12 03:58:27 +0200 |
| commit | 27acdc2c94de558103eb29260c179a49c9b05c14 (patch) | |
| tree | 969d73111d6a1943975fae23ac5ba5747bb6e0d2 /src/pacman/sync.c | |
| parent | f21c45c0ddf195a4dcfca08c19bfa23d1c7fb326 (diff) | |
| download | pacman-27acdc2c94de558103eb29260c179a49c9b05c14.tar.gz pacman-27acdc2c94de558103eb29260c179a49c9b05c14.tar.xz | |
make alpm_strerror binding friendly
I'm currently working on python bindings for alpm written in pyrex. While
working i found that declaring alpm_strerror as
char * alpm_strerror (void)
instead of
char * alpm_strerror (int err)
and then using pm_errno in the implementation instead of err, could make it
more bindings-friendly.
Dan: cleaned up and added void to declaration. Instead of replacing existing
function, add a new function called 'alpm_strerrorlast(void)'.
Signed-off-by: Stefano Esposito <stefano.esposito87@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/sync.c')
| -rw-r--r-- | src/pacman/sync.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 53ec41e9..3e599830 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -205,7 +205,7 @@ static int sync_synctree(int level, alpm_list_t *syncs) alpm_db_get_name(db), downloadLastErrString); } else { fprintf(stderr, _("error: failed to update %s (%s)\n"), - alpm_db_get_name(db), alpm_strerror(pm_errno)); + alpm_db_get_name(db), alpm_strerrorlast()); } } else if(ret == 1) { printf(_(" %s is up to date\n"), alpm_db_get_name(db)); @@ -498,7 +498,7 @@ int pacman_sync(alpm_list_t *targets) if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { fprintf(stderr, _("error: failed to init transaction (%s)\n"), - alpm_strerror(pm_errno)); + alpm_strerrorlast()); if(pm_errno == PM_ERR_HANDLE_LOCK) { printf(_(" if you're sure a package manager is not already\n" " running, you can remove %s.\n"), alpm_option_get_lockfile()); @@ -522,7 +522,7 @@ int pacman_sync(alpm_list_t *targets) printf(_(":: Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade"); if(alpm_trans_sysupgrade() == -1) { - fprintf(stderr, _("error: %s\n"), alpm_strerror(pm_errno)); + fprintf(stderr, _("error: %s\n"), alpm_strerrorlast()); retval = 1; goto cleanup; } @@ -548,18 +548,18 @@ int pacman_sync(alpm_list_t *targets) if(yesno(_(":: Cancel current operation? [Y/n] "))) { if(alpm_trans_release() == -1) { fprintf(stderr, _("error: failed to release transaction (%s)\n"), - alpm_strerror(pm_errno)); + alpm_strerrorlast()); retval = 1; goto cleanup; } if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { fprintf(stderr, _("error: failed to init transaction (%s)\n"), - alpm_strerror(pm_errno)); + alpm_strerrorlast()); return(1); } if(alpm_trans_addtarget("pacman") == -1) { - fprintf(stderr, _("error: pacman: %s\n"), alpm_strerror(pm_errno)); + fprintf(stderr, _("error: pacman: %s\n"), alpm_strerrorlast()); retval = 1; goto cleanup; } @@ -584,7 +584,7 @@ int pacman_sync(alpm_list_t *targets) } if(pm_errno != PM_ERR_PKG_NOT_FOUND) { fprintf(stderr, _("'error: %s': %s\n"), - (char *)i->data, alpm_strerror(pm_errno)); + (char *)i->data, alpm_strerrorlast()); retval = 1; goto cleanup; } @@ -646,7 +646,7 @@ int pacman_sync(alpm_list_t *targets) alpm_list_t *data; if(alpm_trans_prepare(&data) == -1) { fprintf(stderr, _("error: failed to prepare transaction (%s)\n"), - alpm_strerror(pm_errno)); + alpm_strerrorlast()); switch(pm_errno) { alpm_list_t *i; case PM_ERR_UNSATISFIED_DEPS: @@ -722,7 +722,7 @@ int pacman_sync(alpm_list_t *targets) /* Step 3: actually perform the installation */ if(alpm_trans_commit(&data) == -1) { fprintf(stderr, _("error: failed to commit transaction (%s)\n"), - alpm_strerror(pm_errno)); + alpm_strerrorlast()); switch(pm_errno) { alpm_list_t *i; case PM_ERR_FILE_CONFLICTS: @@ -764,7 +764,7 @@ cleanup: } if(alpm_trans_release() == -1) { fprintf(stderr, _("error: failed to release transaction (%s)\n"), - alpm_strerror(pm_errno)); + alpm_strerrorlast()); retval = 1; } |