Merge branch 'en/ort-perf-batch-9'

[thirdparty/git.git] / builtin / unpack-objects.c

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index dd4a75e030d219dfb3e5e0eeb59683c14f02fdf0..4a70b17f8fb394c17f98bc8683e7b38f5bf975ba 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -46,7 +46,7 @@ static struct obj_buffer *lookup_object_buffer(struct object *base)
 static void add_object_buffer(struct object *object, char *buffer, unsigned long size)
 {
        struct obj_buffer *obj;
-       obj = xcalloc(1, sizeof(struct obj_buffer));
+       CALLOC_ARRAY(obj, 1);
        obj->buffer = buffer;
        obj->size = size;
        if (add_decoration(&obj_decorate, object, obj))
@@ -187,7 +187,8 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
  * that have reachability requirements and calls this function.
  * Verify its reachability and validity recursively and write it out.
  */
-static int check_object(struct object *obj, int type, void *data, struct fsck_options *options)
+static int check_object(struct object *obj, enum object_type type,
+                       void *data, struct fsck_options *options)
 {
        struct obj_buffer *obj_buf;
 
@@ -500,7 +501,7 @@ static void unpack_all(void)
 
        if (!quiet)
                progress = start_progress(_("Unpacking objects"), nr_objects);
-       obj_list = xcalloc(nr_objects, sizeof(*obj_list));
+       CALLOC_ARRAY(obj_list, nr_objects);
        for (i = 0; i < nr_objects; i++) {
                unpack_one(i);
                display_progress(progress, i + 1);