Browse Source

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 <gerberb@zenez.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Boyd Lynn Gerber 17 years ago committed by Junio C Hamano
parent
commit
d4c44443b6
  1. 11
      progress.c

11
progress.c

@ -241,16 +241,21 @@ void stop_progress_msg(struct progress **p_progress, const char *msg)
*p_progress = NULL; *p_progress = NULL;
if (progress->last_value != -1) { if (progress->last_value != -1) {
/* Force the last update */ /* Force the last update */
char buf[strlen(msg) + 5]; char buf[128], *bufp;
size_t len = strlen(msg) + 5;
struct throughput *tp = progress->throughput; struct throughput *tp = progress->throughput;

bufp = (len < sizeof(buf)) ? buf : xmalloc(len + 1);
if (tp) { if (tp) {
unsigned int rate = !tp->avg_misecs ? 0 : unsigned int rate = !tp->avg_misecs ? 0 :
tp->avg_bytes / tp->avg_misecs; tp->avg_bytes / tp->avg_misecs;
throughput_string(tp, tp->curr_total, rate); throughput_string(tp, tp->curr_total, rate);
} }
progress_update = 1; progress_update = 1;
sprintf(buf, ", %s.\n", msg); sprintf(bufp, ", %s.\n", msg);
display(progress, progress->last_value, buf); display(progress, progress->last_value, bufp);
if (buf != bufp)
free(bufp);
} }
clear_progress_signal(); clear_progress_signal();
free(progress->throughput); free(progress->throughput);

Loading…
Cancel
Save