undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/two-more-xstrfmt'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2017-02-27 13:57:17 -08:00
commit b760481a3f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bisect.c
View File

@ -940,7 +940,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
struct commit_list *tried; struct commit_list *tried;
int reaches = 0, all = 0, nr, steps; int reaches = 0, all = 0, nr, steps;
const unsigned char *bisect_rev; const unsigned char *bisect_rev;
char steps_msg[32]; char *steps_msg;
read_bisect_terms(&term_bad, &term_good); read_bisect_terms(&term_bad, &term_good);
if (read_bisect_refs()) if (read_bisect_refs())
@ -990,14 +990,15 @@ int bisect_next_all(const char *prefix, int no_checkout)
nr = all - reaches - 1; nr = all - reaches - 1;
steps = estimate_bisect_steps(all); steps = estimate_bisect_steps(all);
xsnprintf(steps_msg, sizeof(steps_msg),
Q_("(roughly %d step)", "(roughly %d steps)", steps), steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
steps); steps), steps);
/* TRANSLATORS: the last %s will be replaced with /* TRANSLATORS: the last %s will be replaced with
"(roughly %d steps)" translation */ "(roughly %d steps)" translation */
printf(Q_("Bisecting: %d revision left to test after this %s\n", printf(Q_("Bisecting: %d revision left to test after this %s\n",
"Bisecting: %d revisions left to test after this %s\n", "Bisecting: %d revisions left to test after this %s\n",
nr), nr, steps_msg); nr), nr, steps_msg);
free(steps_msg);
return bisect_checkout(bisect_rev, no_checkout); return bisect_checkout(bisect_rev, no_checkout);
} }

11
progress.c
View File

@ -243,21 +243,18 @@ 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[128], *bufp; char *buf;
size_t len = strlen(msg) + 5;
struct throughput *tp = progress->throughput; struct throughput *tp = progress->throughput;
bufp = (len < sizeof(buf)) ? buf : xmallocz(len);
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->display, tp->curr_total, rate); throughput_string(&tp->display, tp->curr_total, rate);
} }
progress_update = 1; progress_update = 1;
xsnprintf(bufp, len + 1, ", %s.\n", msg); buf = xstrfmt(", %s.\n", msg);
display(progress, progress->last_value, bufp); display(progress, progress->last_value, buf);
if (buf != bufp) free(buf);
free(bufp);
} }
clear_progress_signal(); clear_progress_signal();
if (progress->throughput) if (progress->throughput)