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 --- http-backend.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'http-backend.c') diff --git a/http-backend.c b/http-backend.c index d2c0a625c..f6b7a5bae 100644 --- a/http-backend.c +++ b/http-backend.c @@ -607,9 +607,7 @@ int main(int argc, char **argv) cmd = c; n = out[0].rm_eo - out[0].rm_so; - cmd_arg = xmalloc(n); - memcpy(cmd_arg, dir + out[0].rm_so + 1, n-1); - cmd_arg[n-1] = '\0'; + cmd_arg = xmemdupz(dir + out[0].rm_so + 1, n - 1); dir[out[0].rm_so] = 0; break; } -- cgit v1.2.1