diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-17 03:53:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-17 03:53:09 +0300 |
| commit | 38bbb9e990e7290c286ad0a8ea250ab53470a374 (patch) | |
| tree | 9643b7ecc0a51c01ade32df122f5d7e1d70d3aff /wt-status.c | |
| parent | 7431379a9c5ed4006603114b1991c6c6e98d5dca (diff) | |
| parent | 99d60545f87445d7050999b826fc4cd49e69376c (diff) | |
Merge branch 'ab/string-list-count-in-size-t'
Count string_list items in size_t, not "unsigned int".
* ab/string-list-count-in-size-t:
string-list API: change "nr" and "alloc" to "size_t"
gettext API users: don't explicitly cast ngettext()'s "n"
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wt-status.c b/wt-status.c index 7da8bbe261..d33f9272b7 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1383,10 +1383,10 @@ static void show_rebase_information(struct wt_status *s, status_printf_ln(s, color, _("No commands done.")); else { status_printf_ln(s, color, - Q_("Last command done (%d command done):", - "Last commands done (%d commands done):", + Q_("Last command done (%"PRIuMAX" command done):", + "Last commands done (%"PRIuMAX" commands done):", have_done.nr), - have_done.nr); + (uintmax_t)have_done.nr); for (i = (have_done.nr > nr_lines_to_show) ? have_done.nr - nr_lines_to_show : 0; i < have_done.nr; @@ -1402,10 +1402,10 @@ static void show_rebase_information(struct wt_status *s, _("No commands remaining.")); else { status_printf_ln(s, color, - Q_("Next command to do (%d remaining command):", - "Next commands to do (%d remaining commands):", + Q_("Next command to do (%"PRIuMAX" remaining command):", + "Next commands to do (%"PRIuMAX" remaining commands):", yet_to_do.nr), - yet_to_do.nr); + (uintmax_t)yet_to_do.nr); for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++) status_printf_ln(s, color, " %s", yet_to_do.items[i].string); if (s->hints) |