From 5c0b13f85ab3a5326508b854768eb70c8829cda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sat, 19 Jul 2014 17:35:34 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/apply.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'builtin/apply.c') diff --git a/builtin/apply.c b/builtin/apply.c index 9c5724eac..622ee1674 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -2869,9 +2869,7 @@ static int apply_binary_fragment(struct image *img, struct patch *patch) case BINARY_LITERAL_DEFLATED: clear_image(img); img->len = fragment->size; - img->buf = xmalloc(img->len+1); - memcpy(img->buf, fragment->patch, img->len); - img->buf[img->len] = '\0'; + img->buf = xmemdupz(fragment->patch, img->len); return 0; } return -1; -- cgit v1.2.1