summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-19 17:35:34 +0200
committerJunio C Hamano <gitster@pobox.com>2014-07-21 10:37:02 -0700
commit5c0b13f85ab3a5326508b854768eb70c8829cda4 (patch)
treec498179a86e3e05abb664caa8d943c81ae4142f5 /builtin/blame.c
parent51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb (diff)
downloadgit-5c0b13f85ab3a5326508b854768eb70c8829cda4.tar.gz
use xmemdupz() to allocate copies of strings given by start and length
Use xmemdupz() to allocate the memory, copy the data and make sure to NUL-terminate the result, all in one step. The resulting code is shorter, doesn't contain the constants 1 and '\0', and avoids duplicating function parameters. For blame, the last copied byte (o->file.ptr[o->file.size]) is always set to NUL by fake_working_tree_commit() or read_sha1_file(), so no information is lost by the conversion to using xmemdupz(). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index ef7cb1d254..6a284ce46b 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2458,11 +2458,8 @@ parse_done:
die("revision walk setup failed");
if (is_null_sha1(sb.final->object.sha1)) {
- char *buf;
o = sb.final->util;
- buf = xmalloc(o->file.size + 1);
- memcpy(buf, o->file.ptr, o->file.size + 1);
- sb.final_buf = buf;
+ sb.final_buf = xmemdupz(o->file.ptr, o->file.size);
sb.final_buf_size = o->file.size;
}
else {