diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-16 13:56:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-16 13:56:43 -0700 |
| commit | f989ac276d310564364482979a78b83d113c4044 (patch) | |
| tree | 82b91fc09a7a3f36293e5a0199f8032f330d6a6d /bisect.c | |
| parent | Merge branch 'vn/line-log-memcpy-size-fix' into maint (diff) | |
| parent | bisect_next_all: convert xsnprintf to xstrfmt (diff) | |
| download | tgif-f989ac276d310564364482979a78b83d113c4044.tar.xz | |
Merge branch 'mm/two-more-xstrfmt' into maint
Code clean-up and a string truncation fix.
* mm/two-more-xstrfmt:
bisect_next_all: convert xsnprintf to xstrfmt
stop_progress_msg: convert xsnprintf to xstrfmt
Diffstat (limited to 'bisect.c')
| -rw-r--r-- | bisect.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -940,7 +940,7 @@ int bisect_next_all(const char *prefix, int no_checkout) struct commit_list *tried; int reaches = 0, all = 0, nr, steps; const unsigned char *bisect_rev; - char steps_msg[32]; + char *steps_msg; read_bisect_terms(&term_bad, &term_good); if (read_bisect_refs()) @@ -990,14 +990,15 @@ int bisect_next_all(const char *prefix, int no_checkout) nr = all - reaches - 1; steps = estimate_bisect_steps(all); - xsnprintf(steps_msg, sizeof(steps_msg), - Q_("(roughly %d step)", "(roughly %d steps)", steps), - steps); + + steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)", + steps), steps); /* TRANSLATORS: the last %s will be replaced with "(roughly %d steps)" translation */ printf(Q_("Bisecting: %d revision left to test after this %s\n", "Bisecting: %d revisions left to test after this %s\n", nr), nr, steps_msg); + free(steps_msg); return bisect_checkout(bisect_rev, no_checkout); } |