cat-file: rename batch_{loose,packed}_object callbacks

We're not really doing the batch-show operation in these
callbacks, but just collecting the set of objects. That
distinction will become more important in a future patch, so
let's rename them now to avoid cluttering that diff.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 4a44b2404fb36bb01758cc68964799a0438d5933..2d34f3b8674c8f43fdb71c47ef5e9597088c76d4 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -420,18 +420,18 @@ static int batch_object_cb(const struct object_id *oid, void *vdata)
        return 0;
 }
 
        return 0;
 }
 

-static int batch_loose_object(const struct object_id *oid,
-                             const char *path,
-                             void *data)
+static int collect_loose_object(const struct object_id *oid,
+                               const char *path,
+                               void *data)

 {
        oid_array_append(data, oid);
        return 0;
 }
 
 {
        oid_array_append(data, oid);
        return 0;
 }
 

-static int batch_packed_object(const struct object_id *oid,
-                              struct packed_git *pack,
-                              uint32_t pos,
-                              void *data)
+static int collect_packed_object(const struct object_id *oid,
+                                struct packed_git *pack,
+                                uint32_t pos,
+                                void *data)

 {
        oid_array_append(data, oid);
        return 0;
 {
        oid_array_append(data, oid);
        return 0;


@@ -476,8 +476,8 @@ static int batch_objects(struct batch_options *opt)
                struct oid_array sa = OID_ARRAY_INIT;
                struct object_cb_data cb;
 
                struct oid_array sa = OID_ARRAY_INIT;
                struct object_cb_data cb;
 

-               for_each_loose_object(batch_loose_object, &sa, 0);
-               for_each_packed_object(batch_packed_object, &sa, 0);
+               for_each_loose_object(collect_loose_object, &sa, 0);
+               for_each_packed_object(collect_packed_object, &sa, 0);

                if (repository_format_partial_clone)
                        warning("This repository has extensions.partialClone set. Some objects may not be loaded.");
 
                if (repository_format_partial_clone)
                        warning("This repository has extensions.partialClone set. Some objects may not be loaded.");