list-objects: store common func args in struct

This will make utility functions easier to create, as done by the next
patch.

Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/list-objects.c b/list-objects.c
index c99c47ac181612db5122a313557090e1957fea4f..584518a3fade48bce872fc5a4c09b97b286f43d2 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -12,20 +12,25 @@
 #include "packfile.h"
 #include "object-store.h"
 
 #include "packfile.h"
 #include "object-store.h"
 

-static void process_blob(struct rev_info *revs,
+struct traversal_context {
+       struct rev_info *revs;
+       show_object_fn show_object;
+       show_commit_fn show_commit;
+       void *show_data;
+       filter_object_fn filter_fn;
+       void *filter_data;
+};
+
+static void process_blob(struct traversal_context *ctx,

                         struct blob *blob,
                         struct blob *blob,

-                        show_object_fn show,

                         struct strbuf *path,
                         struct strbuf *path,

-                        const char *name,
-                        void *cb_data,
-                        filter_object_fn filter_fn,
-                        void *filter_data)
+                        const char *name)

 {
        struct object *obj = &blob->object;
        size_t pathlen;
        enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
 
 {
        struct object *obj = &blob->object;
        size_t pathlen;
        enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
 

-       if (!revs->blob_objects)
+       if (!ctx->revs->blob_objects)

                return;
        if (!obj)
                die("bad blob object");
                return;
        if (!obj)
                die("bad blob object");


@@ -41,21 +46,21 @@ static void process_blob(struct rev_info *revs,
         * may cause the actual filter to report an incomplete list
         * of missing objects.
         */
         * may cause the actual filter to report an incomplete list
         * of missing objects.
         */

-       if (revs->exclude_promisor_objects &&
+       if (ctx->revs->exclude_promisor_objects &&

            !has_object_file(&obj->oid) &&
            is_promisor_object(&obj->oid))
                return;
 
        pathlen = path->len;
        strbuf_addstr(path, name);
            !has_object_file(&obj->oid) &&
            is_promisor_object(&obj->oid))
                return;
 
        pathlen = path->len;
        strbuf_addstr(path, name);

-       if (!(obj->flags & USER_GIVEN) && filter_fn)
-               r = filter_fn(LOFS_BLOB, obj,
-                             path->buf, &path->buf[pathlen],
-                             filter_data);
+       if (!(obj->flags & USER_GIVEN) && ctx->filter_fn)
+               r = ctx->filter_fn(LOFS_BLOB, obj,
+                                  path->buf, &path->buf[pathlen],
+                                  ctx->filter_data);

        if (r & LOFR_MARK_SEEN)
                obj->flags |= SEEN;
        if (r & LOFR_DO_SHOW)
        if (r & LOFR_MARK_SEEN)
                obj->flags |= SEEN;
        if (r & LOFR_DO_SHOW)

-               show(obj, path->buf, cb_data);
+               ctx->show_object(obj, path->buf, ctx->show_data);

        strbuf_setlen(path, pathlen);
 }
 
        strbuf_setlen(path, pathlen);
 }
 


@@ -81,26 +86,21 @@ static void process_blob(struct rev_info *revs,
  * the link, and how to do it. Whether it necessarily makes
  * any sense what-so-ever to ever do that is another issue.
  */
  * the link, and how to do it. Whether it necessarily makes
  * any sense what-so-ever to ever do that is another issue.
  */

-static void process_gitlink(struct rev_info *revs,
+static void process_gitlink(struct traversal_context *ctx,

                            const unsigned char *sha1,
                            const unsigned char *sha1,

-                           show_object_fn show,

                            struct strbuf *path,
                            struct strbuf *path,

-                           const char *name,
-                           void *cb_data)
+                           const char *name)

 {
        /* Nothing to do */
 }
 
 {
        /* Nothing to do */
 }
 

-static void process_tree(struct rev_info *revs,
+static void process_tree(struct traversal_context *ctx,

                         struct tree *tree,
                         struct tree *tree,

-                        show_object_fn show,

                         struct strbuf *base,
                         struct strbuf *base,

-                        const char *name,
-                        void *cb_data,
-                        filter_object_fn filter_fn,
-                        void *filter_data)
+                        const char *name)

 {
        struct object *obj = &tree->object;
 {
        struct object *obj = &tree->object;

+       struct rev_info *revs = ctx->revs;

        struct tree_desc desc;
        struct name_entry entry;
        enum interesting match = revs->diffopt.pathspec.nr == 0 ?
        struct tree_desc desc;
        struct name_entry entry;
        enum interesting match = revs->diffopt.pathspec.nr == 0 ?


@@ -133,14 +133,14 @@ static void process_tree(struct rev_info *revs,
        }
 
        strbuf_addstr(base, name);
        }
 
        strbuf_addstr(base, name);

-       if (!(obj->flags & USER_GIVEN) && filter_fn)
-               r = filter_fn(LOFS_BEGIN_TREE, obj,
-                             base->buf, &base->buf[baselen],
-                             filter_data);
+       if (!(obj->flags & USER_GIVEN) && ctx->filter_fn)
+               r = ctx->filter_fn(LOFS_BEGIN_TREE, obj,
+                                  base->buf, &base->buf[baselen],
+                                  ctx->filter_data);

        if (r & LOFR_MARK_SEEN)
                obj->flags |= SEEN;
        if (r & LOFR_DO_SHOW)
        if (r & LOFR_MARK_SEEN)
                obj->flags |= SEEN;
        if (r & LOFR_DO_SHOW)

-               show(obj, base->buf, cb_data);
+               ctx->show_object(obj, base->buf, ctx->show_data);

        if (base->len)
                strbuf_addch(base, '/');
 
        if (base->len)
                strbuf_addch(base, '/');
 


@@ -157,29 +157,25 @@ static void process_tree(struct rev_info *revs,
                }
 
                if (S_ISDIR(entry.mode))
                }
 
                if (S_ISDIR(entry.mode))

-                       process_tree(revs,
+                       process_tree(ctx,

                                     lookup_tree(the_repository, entry.oid),
                                     lookup_tree(the_repository, entry.oid),

-                                    show, base, entry.path,
-                                    cb_data, filter_fn, filter_data);
+                                    base, entry.path);

                else if (S_ISGITLINK(entry.mode))
                else if (S_ISGITLINK(entry.mode))

-                       process_gitlink(revs, entry.oid->hash,
-                                       show, base, entry.path,
-                                       cb_data);
+                       process_gitlink(ctx, entry.oid->hash, base, entry.path);

                else
                else

-                       process_blob(revs,
+                       process_blob(ctx,

                                     lookup_blob(the_repository, entry.oid),
                                     lookup_blob(the_repository, entry.oid),

-                                    show, base, entry.path,
-                                    cb_data, filter_fn, filter_data);
+                                    base, entry.path);

        }
 
        }
 

-       if (!(obj->flags & USER_GIVEN) && filter_fn) {
-               r = filter_fn(LOFS_END_TREE, obj,
-                             base->buf, &base->buf[baselen],
-                             filter_data);
+       if (!(obj->flags & USER_GIVEN) && ctx->filter_fn) {
+               r = ctx->filter_fn(LOFS_END_TREE, obj,
+                                  base->buf, &base->buf[baselen],
+                                  ctx->filter_data);

                if (r & LOFR_MARK_SEEN)
                        obj->flags |= SEEN;
                if (r & LOFR_DO_SHOW)
                if (r & LOFR_MARK_SEEN)
                        obj->flags |= SEEN;
                if (r & LOFR_DO_SHOW)

-                       show(obj, base->buf, cb_data);
+                       ctx->show_object(obj, base->buf, ctx->show_data);

        }
 
        strbuf_setlen(base, baselen);
        }
 
        strbuf_setlen(base, baselen);


@@ -242,19 +238,15 @@ static void add_pending_tree(struct rev_info *revs, struct tree *tree)
        add_pending_object(revs, &tree->object, "");
 }
 
        add_pending_object(revs, &tree->object, "");
 }
 

-static void traverse_trees_and_blobs(struct rev_info *revs,
-                                    struct strbuf *base,
-                                    show_object_fn show_object,
-                                    void *show_data,
-                                    filter_object_fn filter_fn,
-                                    void *filter_data)
+static void traverse_trees_and_blobs(struct traversal_context *ctx,
+                                    struct strbuf *base)

 {
        int i;
 
        assert(base->len == 0);
 
 {
        int i;
 
        assert(base->len == 0);
 

-       for (i = 0; i < revs->pending.nr; i++) {
-               struct object_array_entry *pending = revs->pending.objects + i;
+       for (i = 0; i < ctx->revs->pending.nr; i++) {
+               struct object_array_entry *pending = ctx->revs->pending.objects + i;

                struct object *obj = pending->item;
                const char *name = pending->name;
                const char *path = pending->path;
                struct object *obj = pending->item;
                const char *name = pending->name;
                const char *path = pending->path;


@@ -262,62 +254,49 @@ static void traverse_trees_and_blobs(struct rev_info *revs,
                        continue;
                if (obj->type == OBJ_TAG) {
                        obj->flags |= SEEN;
                        continue;
                if (obj->type == OBJ_TAG) {
                        obj->flags |= SEEN;

-                       show_object(obj, name, show_data);
+                       ctx->show_object(obj, name, ctx->show_data);

                        continue;
                }
                if (!path)
                        path = "";
                if (obj->type == OBJ_TREE) {
                        continue;
                }
                if (!path)
                        path = "";
                if (obj->type == OBJ_TREE) {

-                       process_tree(revs, (struct tree *)obj, show_object,
-                                    base, path, show_data,
-                                    filter_fn, filter_data);
+                       process_tree(ctx, (struct tree *)obj, base, path);

                        continue;
                }
                if (obj->type == OBJ_BLOB) {
                        continue;
                }
                if (obj->type == OBJ_BLOB) {

-                       process_blob(revs, (struct blob *)obj, show_object,
-                                    base, path, show_data,
-                                    filter_fn, filter_data);
+                       process_blob(ctx, (struct blob *)obj, base, path);

                        continue;
                }
                die("unknown pending object %s (%s)",
                    oid_to_hex(&obj->oid), name);
        }
                        continue;
                }
                die("unknown pending object %s (%s)",
                    oid_to_hex(&obj->oid), name);
        }

-       object_array_clear(&revs->pending);
+       object_array_clear(&ctx->revs->pending);

 }
 
 }
 

-static void do_traverse(struct rev_info *revs,
-                       show_commit_fn show_commit,
-                       show_object_fn show_object,
-                       void *show_data,
-                       filter_object_fn filter_fn,
-                       void *filter_data)
+static void do_traverse(struct traversal_context *ctx)

 {
        struct commit *commit;
        struct strbuf csp; /* callee's scratch pad */
        strbuf_init(&csp, PATH_MAX);
 
 {
        struct commit *commit;
        struct strbuf csp; /* callee's scratch pad */
        strbuf_init(&csp, PATH_MAX);
 

-       while ((commit = get_revision(revs)) != NULL) {
+       while ((commit = get_revision(ctx->revs)) != NULL) {

                /*
                 * an uninteresting boundary commit may not have its tree
                 * parsed yet, but we are not going to show them anyway
                 */
                if (get_commit_tree(commit))
                /*
                 * an uninteresting boundary commit may not have its tree
                 * parsed yet, but we are not going to show them anyway
                 */
                if (get_commit_tree(commit))

-                       add_pending_tree(revs, get_commit_tree(commit));
-               show_commit(commit, show_data);
+                       add_pending_tree(ctx->revs, get_commit_tree(commit));
+               ctx->show_commit(commit, ctx->show_data);

 
 

-               if (revs->tree_blobs_in_commit_order)
+               if (ctx->revs->tree_blobs_in_commit_order)

                        /*
                         * NEEDSWORK: Adding the tree and then flushing it here
                         * needs a reallocation for each commit. Can we pass the
                         * tree directory without allocation churn?
                         */
                        /*
                         * NEEDSWORK: Adding the tree and then flushing it here
                         * needs a reallocation for each commit. Can we pass the
                         * tree directory without allocation churn?
                         */

-                       traverse_trees_and_blobs(revs, &csp,
-                                                show_object, show_data,
-                                                filter_fn, filter_data);
+                       traverse_trees_and_blobs(ctx, &csp);

        }
        }

-       traverse_trees_and_blobs(revs, &csp,
-                                show_object, show_data,
-                                filter_fn, filter_data);
+       traverse_trees_and_blobs(ctx, &csp);

        strbuf_release(&csp);
 }
 
        strbuf_release(&csp);
 }
 


@@ -326,7 +305,14 @@ void traverse_commit_list(struct rev_info *revs,
                          show_object_fn show_object,
                          void *show_data)
 {
                          show_object_fn show_object,
                          void *show_data)
 {

-       do_traverse(revs, show_commit, show_object, show_data, NULL, NULL);
+       struct traversal_context ctx;
+       ctx.revs = revs;
+       ctx.show_commit = show_commit;
+       ctx.show_object = show_object;
+       ctx.show_data = show_data;
+       ctx.filter_fn = NULL;
+       ctx.filter_data = NULL;
+       do_traverse(&ctx);

 }
 
 void traverse_commit_list_filtered(
 }
 
 void traverse_commit_list_filtered(


@@ -337,14 +323,18 @@ void traverse_commit_list_filtered(
        void *show_data,
        struct oidset *omitted)
 {
        void *show_data,
        struct oidset *omitted)
 {

-       filter_object_fn filter_fn = NULL;
+       struct traversal_context ctx;

        filter_free_fn filter_free_fn = NULL;
        filter_free_fn filter_free_fn = NULL;

-       void *filter_data = NULL;
-
-       filter_data = list_objects_filter__init(omitted, filter_options,
-                                               &filter_fn, &filter_free_fn);
-       do_traverse(revs, show_commit, show_object, show_data,
-                   filter_fn, filter_data);
-       if (filter_data && filter_free_fn)
-               filter_free_fn(filter_data);
+
+       ctx.revs = revs;
+       ctx.show_object = show_object;
+       ctx.show_commit = show_commit;
+       ctx.show_data = show_data;
+       ctx.filter_fn = NULL;
+
+       ctx.filter_data = list_objects_filter__init(omitted, filter_options,
+                                                   &ctx.filter_fn, &filter_free_fn);
+       do_traverse(&ctx);
+       if (ctx.filter_data && filter_free_fn)
+               filter_free_fn(ctx.filter_data);

 }
 }