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
@ -185,7 +185,7 @@ static void init_thread(void)
|
||||
if (show_stat)
|
||||
pthread_mutex_init(&deepest_delta_mutex, NULL);
|
||||
pthread_key_create(&key, NULL);
|
||||
thread_data = xcalloc(nr_threads, sizeof(*thread_data));
|
||||
CALLOC_ARRAY(thread_data, nr_threads);
|
||||
for (i = 0; i < nr_threads; i++) {
|
||||
thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
|
||||
if (thread_data[i].pack_fd == -1)
|
||||
@ -1674,7 +1674,7 @@ static void show_pack_info(int stat_only)
|
||||
unsigned long *chain_histogram = NULL;
|
||||
|
||||
if (deepest_delta)
|
||||
chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
|
||||
CALLOC_ARRAY(chain_histogram, deepest_delta);
|
||||
|
||||
for (i = 0; i < nr_objects; i++) {
|
||||
struct object_entry *obj = &objects[i];
|
||||
@ -1912,10 +1912,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
|
||||
|
||||
curr_pack = open_pack_file(pack_name);
|
||||
parse_pack_header();
|
||||
objects = xcalloc(st_add(nr_objects, 1), sizeof(struct object_entry));
|
||||
CALLOC_ARRAY(objects, st_add(nr_objects, 1));
|
||||
if (show_stat)
|
||||
obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
|
||||
ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
|
||||
CALLOC_ARRAY(obj_stat, st_add(nr_objects, 1));
|
||||
CALLOC_ARRAY(ofs_deltas, nr_objects);
|
||||
parse_pack_objects(pack_hash);
|
||||
if (report_end_of_input)
|
||||
write_in_full(2, "\0", 1);
|
||||
|
||||
Reference in New Issue
Block a user