diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:17 -0800 |
| commit | b760481a3fccd9edcf41bc1140201639b7f11ea0 (patch) | |
| tree | 35982728a3ee85792c9b55e6db3718c9164a61c9 /progress.c | |
| parent | b4ca5d05e7ad4ec67eddaadc9ade9a01581214b1 (diff) | |
| parent | 2cfa83574c4b2685208a1e6062fdc573c887cf00 (diff) | |
| download | git-b760481a3fccd9edcf41bc1140201639b7f11ea0.tar.gz | |
Merge branch 'mm/two-more-xstrfmt'
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 'progress.c')
| -rw-r--r-- | progress.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/progress.c b/progress.c index 76a88c573f..29378caa05 100644 --- a/progress.c +++ b/progress.c @@ -243,21 +243,18 @@ void stop_progress_msg(struct progress **p_progress, const char *msg) *p_progress = NULL; if (progress->last_value != -1) { /* Force the last update */ - char buf[128], *bufp; - size_t len = strlen(msg) + 5; + char *buf; struct throughput *tp = progress->throughput; - bufp = (len < sizeof(buf)) ? buf : xmallocz(len); if (tp) { unsigned int rate = !tp->avg_misecs ? 0 : tp->avg_bytes / tp->avg_misecs; throughput_string(&tp->display, tp->curr_total, rate); } progress_update = 1; - xsnprintf(bufp, len + 1, ", %s.\n", msg); - display(progress, progress->last_value, bufp); - if (buf != bufp) - free(bufp); + buf = xstrfmt(", %s.\n", msg); + display(progress, progress->last_value, buf); + free(buf); } clear_progress_signal(); if (progress->throughput) |