list-objects: drop name_path entirely

In the previous commit, we left name_path as a thin wrapper
around a strbuf. This patch drops it entirely. As a result,
every show_object_fn callback needs to be adjusted. However,
none of their code needs to be changed at all, because the
only use was to pass it to path_name(), which now handles
the bare strbuf.

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

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 4dae5b11c28deb3c296cbd89753cafe3ca7a1e90..8bbb9bd9aa9b58d75d4998f118954cebfa7493e4 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2285,7 +2285,7 @@ static void show_commit(struct commit *commit, void *data)
 }
 
 static void show_object(struct object *obj,
 }
 
 static void show_object(struct object *obj,

-                       const struct name_path *path, const char *last,
+                       struct strbuf *path, const char *last,

                        void *data)
 {
        char *name = path_name(path, last);
                        void *data)
 {
        char *name = path_name(path, last);


@@ -2480,7 +2480,7 @@ static int get_object_list_from_bitmap(struct rev_info *revs)
 }
 
 static void record_recent_object(struct object *obj,
 }
 
 static void record_recent_object(struct object *obj,

-                                const struct name_path *path,
+                                struct strbuf *path,

                                 const char *last,
                                 void *data)
 {
                                 const char *last,
                                 void *data)
 {

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 3aa89a1a3cd951afdb97cf1fe371404fc96bca8d..a92c3ca852c9788222985d991006407dfdf5a89f 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -178,7 +178,7 @@ static void finish_commit(struct commit *commit, void *data)
 }
 
 static void finish_object(struct object *obj,
 }
 
 static void finish_object(struct object *obj,

-                         const struct name_path *path, const char *name,
+                         struct strbuf *path, const char *name,

                          void *cb_data)
 {
        struct rev_list_info *info = cb_data;
                          void *cb_data)
 {
        struct rev_list_info *info = cb_data;


@@ -189,7 +189,7 @@ static void finish_object(struct object *obj,
 }
 
 static void show_object(struct object *obj,
 }
 
 static void show_object(struct object *obj,

-                       const struct name_path *path, const char *component,
+                       struct strbuf *path, const char *component,

                        void *cb_data)
 {
        struct rev_list_info *info = cb_data;
                        void *cb_data)
 {
        struct rev_list_info *info = cb_data;

diff --git a/list-objects.c b/list-objects.c
index 4f60a3ea2aa5ce66898b9a7b7e1faa43c792b7c3..43977665d30f545ab07c023f9abfc50c329a7818 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -11,7 +11,7 @@
 static void process_blob(struct rev_info *revs,
                         struct blob *blob,
                         show_object_fn show,
 static void process_blob(struct rev_info *revs,
                         struct blob *blob,
                         show_object_fn show,

-                        struct name_path *path,
+                        struct strbuf *path,

                         const char *name,
                         void *cb_data)
 {
                         const char *name,
                         void *cb_data)
 {


@@ -52,7 +52,7 @@ static void process_blob(struct rev_info *revs,
 static void process_gitlink(struct rev_info *revs,
                            const unsigned char *sha1,
                            show_object_fn show,
 static void process_gitlink(struct rev_info *revs,
                            const unsigned char *sha1,
                            show_object_fn show,

-                           struct name_path *path,
+                           struct strbuf *path,

                            const char *name,
                            void *cb_data)
 {
                            const char *name,
                            void *cb_data)
 {


@@ -69,7 +69,6 @@ static void process_tree(struct rev_info *revs,
        struct object *obj = &tree->object;
        struct tree_desc desc;
        struct name_entry entry;
        struct object *obj = &tree->object;
        struct tree_desc desc;
        struct name_entry entry;

-       struct name_path me;

        enum interesting match = revs->diffopt.pathspec.nr == 0 ?
                all_entries_interesting: entry_not_interesting;
        int baselen = base->len;
        enum interesting match = revs->diffopt.pathspec.nr == 0 ?
                all_entries_interesting: entry_not_interesting;
        int baselen = base->len;


@@ -87,8 +86,7 @@ static void process_tree(struct rev_info *revs,
        }
 
        obj->flags |= SEEN;
        }
 
        obj->flags |= SEEN;

-       me.base = base;
-       show(obj, &me, name, cb_data);
+       show(obj, base, name, cb_data);

 
        strbuf_addstr(base, name);
        if (base->len)
 
        strbuf_addstr(base, name);
        if (base->len)


@@ -113,12 +111,12 @@ static void process_tree(struct rev_info *revs,
                                     cb_data);
                else if (S_ISGITLINK(entry.mode))
                        process_gitlink(revs, entry.sha1,
                                     cb_data);
                else if (S_ISGITLINK(entry.mode))
                        process_gitlink(revs, entry.sha1,

-                                       show, &me, entry.path,
+                                       show, base, entry.path,

                                        cb_data);
                else
                        process_blob(revs,
                                     lookup_blob(entry.sha1),
                                        cb_data);
                else
                        process_blob(revs,
                                     lookup_blob(entry.sha1),

-                                    show, &me, entry.path,
+                                    show, base, entry.path,

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

diff --git a/list-objects.h b/list-objects.h
index 136a1da5a6f048c0f4645112cdbf29c7b0982526..69c4c7de6efef0e6faa21a10438ea362b151e623 100644 (file)
--- a/list-objects.h
+++ b/list-objects.h
@@ -2,7 +2,7 @@
 #define LIST_OBJECTS_H
 
 typedef void (*show_commit_fn)(struct commit *, void *);
 #define LIST_OBJECTS_H
 
 typedef void (*show_commit_fn)(struct commit *, void *);

-typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *);
+typedef void (*show_object_fn)(struct object *, struct strbuf *, const char *, void *);

 void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
 
 typedef void (*show_edge_fn)(struct commit *);
 void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
 
 typedef void (*show_edge_fn)(struct commit *);

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 6bff970c905b6a9c8a04773d64afb164dd124cbe..65ed3425b33f435c92163d3347f167766c5d8595 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -148,7 +148,7 @@ static uint32_t find_object_pos(const unsigned char *sha1)
        return entry->in_pack_pos;
 }
 
        return entry->in_pack_pos;
 }
 

-static void show_object(struct object *object, const struct name_path *path,
+static void show_object(struct object *object, struct strbuf *path,

                        const char *last, void *data)
 {
        struct bitmap *base = data;
                        const char *last, void *data)
 {
        struct bitmap *base = data;

diff --git a/pack-bitmap.c b/pack-bitmap.c
index dd8dc16e676fb3e928560002c0cb7e1f36910e1a..51f790e7ce10d4e570fd909c97268c40929a61e7 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -414,7 +414,7 @@ static int ext_index_add_object(struct object *object, const char *name)
        return bitmap_pos + bitmap_git.pack->num_objects;
 }
 
        return bitmap_pos + bitmap_git.pack->num_objects;
 }
 

-static void show_object(struct object *object, const struct name_path *path,
+static void show_object(struct object *object, struct strbuf *path,

                        const char *last, void *data)
 {
        struct bitmap *base = data;
                        const char *last, void *data)
 {
        struct bitmap *base = data;


@@ -895,7 +895,7 @@ struct bitmap_test_data {
 };
 
 static void test_show_object(struct object *object,
 };
 
 static void test_show_object(struct object *object,

-                            const struct name_path *path,
+                            struct strbuf *path,

                             const char *last, void *data)
 {
        struct bitmap_test_data *tdata = data;
                             const char *last, void *data)
 {
        struct bitmap_test_data *tdata = data;

diff --git a/reachable.c b/reachable.c
index 43616d49c7f88166d2fa2f009ca5b926d751ab0b..e60f08d2f0418471cf8253b48cf7fc8d4d3a894d 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -43,7 +43,7 @@ static int add_one_ref(const char *path, const struct object_id *oid,
  * The traversal will have already marked us as SEEN, so we
  * only need to handle any progress reporting here.
  */
  * The traversal will have already marked us as SEEN, so we
  * only need to handle any progress reporting here.
  */

-static void mark_object(struct object *obj, const struct name_path *path,
+static void mark_object(struct object *obj, struct strbuf *path,

                        const char *name, void *data)
 {
        update_progress(data);
                        const char *name, void *data)
 {
        update_progress(data);

diff --git a/revision.c b/revision.c
index 8dd09508ab887836d9a279d3c3b294207e3742ea..3c847818164481f655d2dc822ffa5ade184a3058 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -25,17 +25,17 @@ volatile show_early_output_fn_t show_early_output;
 static const char *term_bad;
 static const char *term_good;
 
 static const char *term_bad;
 static const char *term_good;
 

-char *path_name(const struct name_path *path, const char *name)
+char *path_name(struct strbuf *path, const char *name)

 {
        struct strbuf ret = STRBUF_INIT;
        if (path)
 {
        struct strbuf ret = STRBUF_INIT;
        if (path)

-               strbuf_addbuf(&ret, path->base);
+               strbuf_addbuf(&ret, path);

        strbuf_addstr(&ret, name);
        return strbuf_detach(&ret, NULL);
 }
 
 void show_object_with_name(FILE *out, struct object *obj,
        strbuf_addstr(&ret, name);
        return strbuf_detach(&ret, NULL);
 }
 
 void show_object_with_name(FILE *out, struct object *obj,

-                          const struct name_path *path, const char *component)
+                          struct strbuf *path, const char *component)

 {
        char *name = path_name(path, component);
        char *p;
 {
        char *name = path_name(path, component);
        char *p;

diff --git a/revision.h b/revision.h
index 2a26310d6cc025f5ae07f12c0f965b9c3d16414b..7beab15248f696a165a51cbe683000d3ede85939 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -257,14 +257,10 @@ extern void put_revision_mark(const struct rev_info *revs,
 extern void mark_parents_uninteresting(struct commit *commit);
 extern void mark_tree_uninteresting(struct tree *tree);
 
 extern void mark_parents_uninteresting(struct commit *commit);
 extern void mark_tree_uninteresting(struct tree *tree);
 

-struct name_path {
-       struct strbuf *base;
-};
-
-char *path_name(const struct name_path *path, const char *name);
+char *path_name(struct strbuf *path, const char *name);

 
 extern void show_object_with_name(FILE *, struct object *,
 
 extern void show_object_with_name(FILE *, struct object *,

-                                 const struct name_path *, const char *);
+                                 struct strbuf *, const char *);

 
 extern void add_pending_object(struct rev_info *revs,
                               struct object *obj, const char *name);
 
 extern void add_pending_object(struct rev_info *revs,
                               struct object *obj, const char *name);