diff options
| author | Jeff King <peff@peff.net> | 2014-06-19 17:24:33 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-19 15:20:54 -0700 |
| commit | 283101869bea8feb5d58f6ea1b568e9b197526d3 (patch) | |
| tree | 3aba65688e4a5a11a3d0a60d2fa60930fd398898 /builtin/show-branch.c | |
| parent | 95244ae3dd49b3eed4dbfe09299b9d8847622218 (diff) | |
| download | git-283101869bea8feb5d58f6ea1b568e9b197526d3.tar.gz git-283101869bea8feb5d58f6ea1b568e9b197526d3.tar.xz | |
use xstrfmt to replace xmalloc + sprintf
This is one line shorter, and makes sure the length in the
malloc and sprintf steps match.
These conversions are very straightforward; we can drop the
malloc entirely, and replace the sprintf with xstrfmt.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/show-branch.c')
| -rw-r--r-- | builtin/show-branch.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index d87317290..5fd4e4e48 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -755,7 +755,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) } for (i = 0; i < reflog; i++) { - char *logmsg, *m; + char *logmsg; const char *msg; unsigned long timestamp; int tz; @@ -770,11 +770,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) msg = "(none)"; else msg++; - m = xmalloc(strlen(msg) + 200); - sprintf(m, "(%s) %s", - show_date(timestamp, tz, 1), - msg); - reflog_msg[i] = m; + reflog_msg[i] = xstrfmt("(%s) %s", + show_date(timestamp, tz, 1), + msg); free(logmsg); sprintf(nth_desc, "%s@{%d}", *av, base+i); append_ref(nth_desc, sha1, 1); |