diff options
| author | Rikard Falkeborn <rikard.falkeborn@gmail.com> | 2015-11-10 20:51:55 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-11-11 13:47:08 +1000 |
| commit | 9e22e75fa195b17efb6ad911e0e9910330e8a30a (patch) | |
| tree | e76ef827e8d94f6b6a9811c6c94fdcfcca4962b4 /src | |
| parent | bf0e8e6b435f0ab28745d6f6d3279dc66ac3e9ef (diff) | |
| download | pacman-9e22e75fa195b17efb6ad911e0e9910330e8a30a.tar.xz | |
Use correct format specifiers
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/callback.c | 12 | ||||
| -rw-r--r-- | src/pacman/conf.c | 4 | ||||
| -rw-r--r-- | src/pacman/util.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 9260ece9..7a21b22c 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -418,8 +418,8 @@ void cb_question(alpm_question_t *question) alpm_question_select_provider_t *q = &question->select_provider; size_t count = alpm_list_count(q->providers); char *depstring = alpm_dep_compute_string(q->depend); - colon_printf(_n("There is %zd provider available for %s\n", - "There are %zd providers available for %s:\n", count), + colon_printf(_n("There is %zu provider available for %s\n", + "There are %zu providers available for %s:\n", count), count, depstring); free(depstring); select_display(q->providers); @@ -443,10 +443,10 @@ void cb_question(alpm_question_t *question) strftime(created, 12, "%Y-%m-%d", localtime(&time)); if(q->key->revoked) { - q->import = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s (revoked)?"), + q->import = yesno(_("Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"), q->key->length, q->key->pubkey_algo, q->key->fingerprint, q->key->uid, created); } else { - q->import = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s?"), + q->import = yesno(_("Import PGP key %u%c/%s, \"%s\", created: %s?"), q->key->length, q->key->pubkey_algo, q->key->fingerprint, q->key->uid, created); } } @@ -590,8 +590,8 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, } - printf("(%*ld/%*ld) %ls%-*s", digits, (unsigned long)current, - digits, (unsigned long)howmany, wcstr, padwid, ""); + printf("(%*zu/%*zu) %ls%-*s", digits, current, + digits, howmany, wcstr, padwid, ""); free(wcstr); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f02e3612..a2ee9b4d 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -95,8 +95,8 @@ config_t *config_new(void) config_t *newconfig = calloc(1, sizeof(config_t)); if(!newconfig) { pm_printf(ALPM_LOG_ERROR, - _n("malloc failure: could not allocate %zd byte\n", - "malloc failure: could not allocate %zd bytes\n", sizeof(config_t)), + _n("malloc failure: could not allocate %zu byte\n", + "malloc failure: could not allocate %zu bytes\n", sizeof(config_t)), sizeof(config_t)); return NULL; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 5f331e82..3ab71cfd 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -812,7 +812,7 @@ static alpm_list_t *create_verbose_header(size_t count) alpm_list_t *ret = NULL; char *header; - pm_asprintf(&header, "%s (%zd)", _("Package"), count); + pm_asprintf(&header, "%s (%zu)", _("Package"), count); add_table_cell(&ret, header, CELL_TITLE | CELL_FREE); add_table_cell(&ret, _("Old Version"), CELL_TITLE); @@ -921,7 +921,7 @@ static void _display_targets(alpm_list_t *targets, int verbose) } /* print to screen */ - pm_asprintf(&str, "%s (%zd)", _("Packages"), alpm_list_count(targets)); + pm_asprintf(&str, "%s (%zu)", _("Packages"), alpm_list_count(targets)); printf("\n"); cols = getcols(); |