diff options
| author |  Maxim Moseychuk <franchesko.salias.hudro.pedros@gmail.com> | 2017-02-16 20:07:13 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-02-16 11:28:02 -0800 |
| commit | fbd09439c097123346d9823b88c87438bf5a11ae (patch) | |
| tree | f346e2791b612d6c5492857fa109017057018e95 | |
| parent | Git 2.11.1 (diff) | |
| download | tgif-fbd09439c097123346d9823b88c87438bf5a11ae.tar.xz | |
stop_progress_msg: convert xsnprintf to xstrfmt
Simplify code by replacing buffer allocation with a call to xstrfmt().
Signed-off-by: Maxim Moseychuk <franchesko.salias.hudro.pedros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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) |