diff options
Diffstat (limited to 'src/pacman/trans.c')
| -rw-r--r-- | src/pacman/trans.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/pacman/trans.c b/src/pacman/trans.c index ce032dc4..0b141906 100644 --- a/src/pacman/trans.c +++ b/src/pacman/trans.c @@ -84,7 +84,7 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) break; case PM_TRANS_EVT_ADD_START: if(config->noprogressbar) { - MSG(NL, _("installing %s... "), (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME)); + MSG(NL, _("installing %s... "), alpm_pkg_get_name(data1)); } break; case PM_TRANS_EVT_ADD_DONE: @@ -92,13 +92,13 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) MSG(CL, _("done.\n")); } snprintf(str, LOG_STR_LEN, _("installed %s (%s)"), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), - (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION)); + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1)); alpm_logaction(str); break; case PM_TRANS_EVT_REMOVE_START: if(config->noprogressbar) { - MSG(NL, _("removing %s... "), (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME)); + MSG(NL, _("removing %s... "), alpm_pkg_get_name(data1)); } break; case PM_TRANS_EVT_REMOVE_DONE: @@ -106,13 +106,13 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) MSG(CL, _("done.\n")); } snprintf(str, LOG_STR_LEN, _("removed %s (%s)"), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), - (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION)); + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1)); alpm_logaction(str); break; case PM_TRANS_EVT_UPGRADE_START: if(config->noprogressbar) { - MSG(NL, _("upgrading %s... "), (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME)); + MSG(NL, _("upgrading %s... "), alpm_pkg_get_name(data1)); } break; case PM_TRANS_EVT_UPGRADE_DONE: @@ -120,9 +120,9 @@ void cb_trans_evt(unsigned char event, void *data1, void *data2) MSG(CL, _("done.\n")); } snprintf(str, LOG_STR_LEN, _("upgraded %s (%s -> %s)"), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), - (char *)alpm_pkg_getinfo(data2, PM_PKG_VERSION), - (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION)); + (char *)alpm_pkg_get_name(data1), + (char *)alpm_pkg_get_version(data2), + (char *)alpm_pkg_get_version(data1)); alpm_logaction(str); break; case PM_TRANS_EVT_INTEGRITY_START: @@ -178,8 +178,8 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i } } else { snprintf(str, LOG_STR_LEN, _(":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), - (char *)alpm_pkg_getinfo(data2, PM_PKG_NAME)); + alpm_pkg_get_name(data1), + alpm_pkg_get_name(data2)); *response = yesno(str); } break; @@ -192,7 +192,7 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i } } else { snprintf(str, LOG_STR_LEN, _(":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME)); + alpm_pkg_get_name(data1)); *response = yesno(str); } break; @@ -205,9 +205,9 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i } } else { snprintf(str, LOG_STR_LEN, _(":: Replace %s with %s/%s? [Y/n] "), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), + alpm_pkg_get_name(data1), (char *)data3, - (char *)alpm_pkg_getinfo(data2, PM_PKG_NAME)); + alpm_pkg_get_name(data2)); *response = yesno(str); } break; @@ -236,8 +236,8 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i } else { if(!config->op_s_downloadonly) { snprintf(str, LOG_STR_LEN, _(":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), - (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION)); + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1)); *response = yesno(str); } else { *response = 1; @@ -254,8 +254,8 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i } else { if(!config->op_s_downloadonly) { snprintf(str, LOG_STR_LEN, _(":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "), - (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), - (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION)); + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1)); *response = yesno(str); } else { *response = 1; @@ -349,7 +349,7 @@ void cb_trans_progress(unsigned char event, char *pkgname, int percent, int howm break; } - alpm_get_option(PM_OPT_CHOMP, &chomp); + chomp = alpm_option_get_chomp(); /* hide the cursor, prevent flicker during fancy graphics printf("\033[?25l\033[?1c["); |