use CALLOC_ARRAY

[thirdparty/git.git] / builtin / index-pack.c

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index bad57488079c7f7ec715f9efd935e255c871e8f1..21899687e2ceb6700ce3bdee50a1bf9887c569d3 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -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);