use CALLOC_ARRAY
Add and apply a semantic patch for converting code that open-codes CALLOC_ARRAY to use it instead. It shortens the code and infers the element size automatically. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
f1121499e6
commit
ca56dadb4b
12
attr.c
12
attr.c
@ -569,7 +569,7 @@ struct attr_check *attr_check_initl(const char *one, ...)
|
||||
check = attr_check_alloc();
|
||||
check->nr = cnt;
|
||||
check->alloc = cnt;
|
||||
check->items = xcalloc(cnt, sizeof(struct attr_check_item));
|
||||
CALLOC_ARRAY(check->items, cnt);
|
||||
|
||||
check->items[0].attr = git_attr(one);
|
||||
va_start(params, one);
|
||||
@ -670,7 +670,7 @@ static struct attr_stack *read_attr_from_array(const char **list)
|
||||
const char *line;
|
||||
int lineno = 0;
|
||||
|
||||
res = xcalloc(1, sizeof(*res));
|
||||
CALLOC_ARRAY(res, 1);
|
||||
while ((line = *(list++)) != NULL)
|
||||
handle_attr_line(res, line, "[builtin]", ++lineno, 1);
|
||||
return res;
|
||||
@ -707,7 +707,7 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
|
||||
|
||||
if (!fp)
|
||||
return NULL;
|
||||
res = xcalloc(1, sizeof(*res));
|
||||
CALLOC_ARRAY(res, 1);
|
||||
while (fgets(buf, sizeof(buf), fp)) {
|
||||
char *bufp = buf;
|
||||
if (!lineno)
|
||||
@ -733,7 +733,7 @@ static struct attr_stack *read_attr_from_index(const struct index_state *istate,
|
||||
if (!buf)
|
||||
return NULL;
|
||||
|
||||
res = xcalloc(1, sizeof(*res));
|
||||
CALLOC_ARRAY(res, 1);
|
||||
for (sp = buf; *sp; ) {
|
||||
char *ep;
|
||||
int more;
|
||||
@ -774,7 +774,7 @@ static struct attr_stack *read_attr(const struct index_state *istate,
|
||||
}
|
||||
|
||||
if (!res)
|
||||
res = xcalloc(1, sizeof(*res));
|
||||
CALLOC_ARRAY(res, 1);
|
||||
return res;
|
||||
}
|
||||
|
||||
@ -874,7 +874,7 @@ static void bootstrap_attr_stack(const struct index_state *istate,
|
||||
else
|
||||
e = NULL;
|
||||
if (!e)
|
||||
e = xcalloc(1, sizeof(struct attr_stack));
|
||||
CALLOC_ARRAY(e, 1);
|
||||
push_stack(stack, e, NULL, 0);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user