diff options
| author | Dan McGee <dan@archlinux.org> | 2011-09-02 00:35:50 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-03 04:45:08 +0200 |
| commit | 98fdfa1968f81596acd25ed5b77cc968dcd97ead (patch) | |
| tree | a04926263ccf75be1188a4924ed512009023bd89 /lib/libalpm/add.c | |
| parent | 37da18aee8d925ee5cd9f526f2c61d07e9db5b66 (diff) | |
| download | pacman-98fdfa1968f81596acd25ed5b77cc968dcd97ead.tar.gz pacman-98fdfa1968f81596acd25ed5b77cc968dcd97ead.tar.xz | |
Former transaction callback rename refactor
Put all the callback stuff in alpm.h in one spot, and make the following
renames for clarity with the new structure:
ALPM_TRANS_EVT_* --> ALPM_EVENT_*
ALPM_TRANS_CONV_* --> ALPM_QUESTION_*
ALPM_TRANS_PROGRESS_* --> ALPM_PROGRESS_*
alpm_option_get_convcb() --> alpm_option_get_questioncb()
alpm_option_set_convcb() --> alpm_option_set_questioncb()
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 96272a25..b526145a 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -473,7 +473,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, goto cleanup; } - EVENT(handle, ALPM_TRANS_EVT_UPGRADE_START, newpkg, local); + EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); _alpm_log(handle, ALPM_LOG_DEBUG, "upgrading package %s-%s\n", newpkg->name, newpkg->version); @@ -488,7 +488,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } else { is_upgrade = 0; - EVENT(handle, ALPM_TRANS_EVT_ADD_START, newpkg, NULL); + EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s\n", newpkg->name, newpkg->version); @@ -567,10 +567,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* call PROGRESS once with 0 percent, as we sort-of skip that here */ if(is_upgrade) { - PROGRESS(handle, ALPM_TRANS_PROGRESS_UPGRADE_START, + PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, newpkg->name, 0, pkg_count, pkg_current); } else { - PROGRESS(handle, ALPM_TRANS_PROGRESS_ADD_START, + PROGRESS(handle, ALPM_PROGRESS_ADD_START, newpkg->name, 0, pkg_count, pkg_current); } @@ -594,10 +594,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } if(is_upgrade) { - PROGRESS(handle, ALPM_TRANS_PROGRESS_UPGRADE_START, + PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, newpkg->name, percent, pkg_count, pkg_current); } else { - PROGRESS(handle, ALPM_TRANS_PROGRESS_ADD_START, + PROGRESS(handle, ALPM_PROGRESS_ADD_START, newpkg->name, percent, pkg_count, pkg_current); } @@ -649,10 +649,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } if(is_upgrade) { - PROGRESS(handle, ALPM_TRANS_PROGRESS_UPGRADE_START, + PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, newpkg->name, 100, pkg_count, pkg_current); } else { - PROGRESS(handle, ALPM_TRANS_PROGRESS_ADD_START, + PROGRESS(handle, ALPM_PROGRESS_ADD_START, newpkg->name, 100, pkg_count, pkg_current); } @@ -669,9 +669,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } if(is_upgrade) { - EVENT(handle, ALPM_TRANS_EVT_UPGRADE_DONE, newpkg, oldpkg); + EVENT(handle, ALPM_EVENT_UPGRADE_DONE, newpkg, oldpkg); } else { - EVENT(handle, ALPM_TRANS_EVT_ADD_DONE, newpkg, oldpkg); + EVENT(handle, ALPM_EVENT_ADD_DONE, newpkg, oldpkg); } cleanup: |