зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
3b9e3c2ced
Коммит
fbd09439c0
11
progress.c
11
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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче