use xcalloc() to allocate zero-initialized memory

rscharfe · gitster · commit 51a60f5bfbaf · 2014-07-21T10:30:21.000-07:00
Use xcalloc() instead of xmalloc() followed by memset() to allocate
and zero out memory because it's shorter and avoids duplicating the
function parameters.

Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/clean.c b/builtin/clean.c
@@ -621,8 +621,7 @@ static int *list_and_choose(struct menu_opts *opts, struct menu_stuff *stuff)
 				nr += chosen[i];
 		}
 
-		result = xmalloc(sizeof(int) * (nr + 1));
-		memset(result, 0, sizeof(int) * (nr + 1));
+		result = xcalloc(nr + 1, sizeof(int));
 		for (i = 0; i < stuff->nr && j < nr; i++) {
 			if (chosen[i])
 				result[j++] = i;
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
@@ -362,8 +362,7 @@ static void set_thread_data(struct thread_local *data)
 
 static struct base_data *alloc_base_data(void)
 {
-	struct base_data *base = xmalloc(sizeof(struct base_data));
-	memset(base, 0, sizeof(*base));
+	struct base_data *base = xcalloc(1, sizeof(struct base_data));
 	base->ref_last = -1;
 	base->ofs_last = -1;
 	return base;
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -1226,8 +1226,7 @@ static int WSAAPI getaddrinfo_stub(const char *node, const char *service,
 	else
 		ai->ai_canonname = NULL;
 
-	sin = xmalloc(ai->ai_addrlen);
-	memset(sin, 0, ai->ai_addrlen);
+	sin = xcalloc(1, ai->ai_addrlen);
 	sin->sin_family = AF_INET;
 	/* Note: getaddrinfo is supposed to allow service to be a string,
 	 * which should be looked up using getservbyname. This is
diff --git a/pathspec.c b/pathspec.c
@@ -389,8 +389,7 @@ void parse_pathspec(struct pathspec *pathspec,
 		if (!(flags & PATHSPEC_PREFER_CWD))
 			die("BUG: PATHSPEC_PREFER_CWD requires arguments");
 
-		pathspec->items = item = xmalloc(sizeof(*item));
-		memset(item, 0, sizeof(*item));
+		pathspec->items = item = xcalloc(1, sizeof(*item));
 		item->match = prefix;
 		item->original = prefix;
 		item->nowildcard_len = item->len = strlen(prefix);

Original file line number	Diff line number	Diff line change
`@@ -621,8 +621,7 @@ static int list_and_choose(struct menu_opts opts, struct menu_stuff *stuff)`
`621`	`621`	`nr += chosen[i];`
`622`	`622`	`}`
`623`	`623`
`624`		`- result = xmalloc(sizeof(int) * (nr + 1));`
`625`		`- memset(result, 0, sizeof(int) * (nr + 1));`
	`624`	`+ result = xcalloc(nr + 1, sizeof(int));`
`626`	`625`	`for (i = 0; i < stuff->nr && j < nr; i++) {`
`627`	`626`	`if (chosen[i])`
`628`	`627`	`result[j++] = i;`
Original file line number	Diff line number	Diff line change
`@@ -362,8 +362,7 @@ static void set_thread_data(struct thread_local *data)`
`362`	`362`
`363`	`363`	`static struct base_data *alloc_base_data(void)`
`364`	`364`	`{`
`365`		`- struct base_data *base = xmalloc(sizeof(struct base_data));`
`366`		`- memset(base, 0, sizeof(*base));`
	`365`	`+ struct base_data *base = xcalloc(1, sizeof(struct base_data));`
`367`	`366`	`base->ref_last = -1;`
`368`	`367`	`base->ofs_last = -1;`
`369`	`368`	`return base;`