Commit d4c44443 authored by Boyd Lynn Gerber's avatar Boyd Lynn Gerber Committed by Junio C Hamano

progress.c: avoid use of dynamic-sized array

Dynamically sized arrays are gcc and C99 construct.  Using them hurts
portability to older compilers, although using them is nice in this case
it is not desirable.  This patch removes the only use of the construct
in stop_progress_msg(); the function is about writing out a single line
of a message, and the existing callers of this function feed messages
of only bounded size anyway, so use of dynamic array is simply overkill.
Signed-off-by: Boyd Lynn Gerber's avatarBoyd Lynn Gerber <>
Signed-off-by: default avatarJunio C Hamano <>
parent eba1351f
......@@ -241,16 +241,21 @@ 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[strlen(msg) + 5];
char buf[128], *bufp;
size_t len = strlen(msg) + 5;
struct throughput *tp = progress->throughput;
bufp = (len < sizeof(buf)) ? buf : xmalloc(len + 1);
if (tp) {
unsigned int rate = !tp->avg_misecs ? 0 :
tp->avg_bytes / tp->avg_misecs;
throughput_string(tp, tp->curr_total, rate);
progress_update = 1;
sprintf(buf, ", %s.\n", msg);
display(progress, progress->last_value, buf);
sprintf(bufp, ", %s.\n", msg);
display(progress, progress->last_value, bufp);
if (buf != bufp)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment