odb: rename `FOR_EACH_OBJECT_*` flags

Rename the `FOR_EACH_OBJECT_*` flags to have an `ODB_` prefix. This
prepares us for a new upcoming `odb_for_each_object()` function and
ensures that both the function and its flags have the same prefix.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 2ad712e9f8f55ce4d2bc4b1f2d8b8cd1066c56de..6964a5a52c1646cadae97e92aafa35f90e4ce273 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -922,7 +922,7 @@ static int batch_objects(struct batch_options *opt)
                        cb.seen = &seen;
 
                        batch_each_object(opt, batch_unordered_object,
-                                         FOR_EACH_OBJECT_PACK_ORDER, &cb);
+                                         ODB_FOR_EACH_OBJECT_PACK_ORDER, &cb);
 
                        oidset_clear(&seen);
                } else {

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 6ee31d48c94748e34616c0139a4a935ac07d46ad..74317051fdf7f6858829ef9820b53116f4752181 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3912,7 +3912,7 @@ static void read_packs_list_from_stdin(struct rev_info *revs)
                for_each_object_in_pack(p,
                                        add_object_entry_from_pack,
                                        revs,
-                                       FOR_EACH_OBJECT_PACK_ORDER);
+                                       ODB_FOR_EACH_OBJECT_PACK_ORDER);
        }
 
        strbuf_release(&buf);
@@ -4344,10 +4344,10 @@ static void add_objects_in_unpacked_packs(void)
        if (for_each_packed_object(to_pack.repo,
                                   add_object_in_unpacked_pack,
                                   NULL,
-                                  FOR_EACH_OBJECT_PACK_ORDER |
-                                  FOR_EACH_OBJECT_LOCAL_ONLY |
-                                  FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS |
-                                  FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS))
+                                  ODB_FOR_EACH_OBJECT_PACK_ORDER |
+                                  ODB_FOR_EACH_OBJECT_LOCAL_ONLY |
+                                  ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS |
+                                  ODB_FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS))
                die(_("cannot open pack index"));
 }
 

diff --git a/commit-graph.c b/commit-graph.c
index 6b1f02e1792b64745633ffb9ce20de10c1a41d3e..7f1145a0821cbb6bc1ae37f16e2a93cbe237a2f1 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1927,7 +1927,7 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
                        goto cleanup;
                }
                for_each_object_in_pack(p, add_packed_commits, ctx,
-                                       FOR_EACH_OBJECT_PACK_ORDER);
+                                       ODB_FOR_EACH_OBJECT_PACK_ORDER);
                close_pack(p);
                free(p);
        }
@@ -1965,7 +1965,7 @@ static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
                        _("Finding commits for commit graph among packed objects"),
                        ctx->approx_nr_objects);
        for_each_packed_object(ctx->r, add_packed_commits, ctx,
-                              FOR_EACH_OBJECT_PACK_ORDER);
+                              ODB_FOR_EACH_OBJECT_PACK_ORDER);
        if (ctx->progress_done < ctx->approx_nr_objects)
                display_progress(ctx->progress, ctx->approx_nr_objects);
        stop_progress(&ctx->progress);

diff --git a/object-file.c b/object-file.c
index e7e4c3348f9c1bb2bc909d13a41e1eb38a946743..64e9e239dc341a6083bbe45cc3d054e13048c72e 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -1789,7 +1789,7 @@ int for_each_loose_file_in_source(struct odb_source *source,
 
 int for_each_loose_object(struct object_database *odb,
                          each_loose_object_fn cb, void *data,
-                         enum for_each_object_flags flags)
+                         enum odb_for_each_object_flags flags)
 {
        struct odb_source *source;
 
@@ -1800,7 +1800,7 @@ int for_each_loose_object(struct object_database *odb,
                if (r)
                        return r;
 
-               if (flags & FOR_EACH_OBJECT_LOCAL_ONLY)
+               if (flags & ODB_FOR_EACH_OBJECT_LOCAL_ONLY)
                        break;
        }
 

diff --git a/object-file.h b/object-file.h
index 1229d5f675b44aa002cb49d9cdafe6842405cf2c..42bb50e10cf296c657ddc91fcc131a31b2fe95a2 100644 (file)
--- a/object-file.h
+++ b/object-file.h
@@ -134,7 +134,7 @@ int for_each_loose_file_in_source(struct odb_source *source,
  */
 int for_each_loose_object(struct object_database *odb,
                          each_loose_object_fn, void *,
-                         enum for_each_object_flags flags);
+                         enum odb_for_each_object_flags flags);
 
 
 /**

diff --git a/odb.h b/odb.h
index bab07755f4ec95ae3ad67caef291f2f03baf332a..74503addf1462caf7b07088c1270f6d95a51a9cd 100644 (file)
--- a/odb.h
+++ b/odb.h
@@ -442,24 +442,25 @@ static inline void obj_read_unlock(void)
        if(obj_read_use_lock)
                pthread_mutex_unlock(&obj_read_mutex);
 }
+
 /* Flags for for_each_*_object(). */
-enum for_each_object_flags {
+enum odb_for_each_object_flags {
        /* Iterate only over local objects, not alternates. */
-       FOR_EACH_OBJECT_LOCAL_ONLY = (1<<0),
+       ODB_FOR_EACH_OBJECT_LOCAL_ONLY = (1<<0),
 
        /* Only iterate over packs obtained from the promisor remote. */
-       FOR_EACH_OBJECT_PROMISOR_ONLY = (1<<1),
+       ODB_FOR_EACH_OBJECT_PROMISOR_ONLY = (1<<1),
 
        /*
         * Visit objects within a pack in packfile order rather than .idx order
         */
-       FOR_EACH_OBJECT_PACK_ORDER = (1<<2),
+       ODB_FOR_EACH_OBJECT_PACK_ORDER = (1<<2),
 
        /* Only iterate over packs that are not marked as kept in-core. */
-       FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS = (1<<3),
+       ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS = (1<<3),
 
        /* Only iterate over packs that do not have .keep files. */
-       FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
+       ODB_FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
 };
 
 enum {

diff --git a/packfile.c b/packfile.c
index 402c3b5dc731318a8faed0dae320172958191558..b65f0b43f16eb38f3988750324186588f188bd6a 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -2259,12 +2259,12 @@ int has_object_kept_pack(struct repository *r, const struct object_id *oid,
 
 int for_each_object_in_pack(struct packed_git *p,
                            each_packed_object_fn cb, void *data,
-                           enum for_each_object_flags flags)
+                           enum odb_for_each_object_flags flags)
 {
        uint32_t i;
        int r = 0;
 
-       if (flags & FOR_EACH_OBJECT_PACK_ORDER) {
+       if (flags & ODB_FOR_EACH_OBJECT_PACK_ORDER) {
                if (load_pack_revindex(p->repo, p))
                        return -1;
        }
@@ -2285,7 +2285,7 @@ int for_each_object_in_pack(struct packed_git *p,
                 *   - in pack-order, it is pack position, which we must
                 *     convert to an index position in order to get the oid.
                 */
-               if (flags & FOR_EACH_OBJECT_PACK_ORDER)
+               if (flags & ODB_FOR_EACH_OBJECT_PACK_ORDER)
                        index_pos = pack_pos_to_index(p, i);
                else
                        index_pos = i;
@@ -2302,7 +2302,7 @@ int for_each_object_in_pack(struct packed_git *p,
 }
 
 int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
-                          void *data, enum for_each_object_flags flags)
+                          void *data, enum odb_for_each_object_flags flags)
 {
        struct odb_source *source;
        int r = 0;
@@ -2318,15 +2318,15 @@ int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
                for (e = packfile_store_get_packs(source->packfiles); e; e = e->next) {
                        struct packed_git *p = e->pack;
 
-                       if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
+                       if ((flags & ODB_FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
                                continue;
-                       if ((flags & FOR_EACH_OBJECT_PROMISOR_ONLY) &&
+                       if ((flags & ODB_FOR_EACH_OBJECT_PROMISOR_ONLY) &&
                            !p->pack_promisor)
                                continue;
-                       if ((flags & FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS) &&
+                       if ((flags & ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS) &&
                            p->pack_keep_in_core)
                                continue;
-                       if ((flags & FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS) &&
+                       if ((flags & ODB_FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS) &&
                            p->pack_keep)
                                continue;
                        if (open_pack_index(p)) {
@@ -2413,8 +2413,8 @@ int is_promisor_object(struct repository *r, const struct object_id *oid)
                if (repo_has_promisor_remote(r)) {
                        for_each_packed_object(r, add_promisor_object,
                                               &promisor_objects,
-                                              FOR_EACH_OBJECT_PROMISOR_ONLY |
-                                              FOR_EACH_OBJECT_PACK_ORDER);
+                                              ODB_FOR_EACH_OBJECT_PROMISOR_ONLY |
+                                              ODB_FOR_EACH_OBJECT_PACK_ORDER);
                }
                promisor_objects_prepared = 1;
        }

diff --git a/packfile.h b/packfile.h
index acc5c55ad57754eef058317a3a4254399d742f28..15551258bde5191a41da79fbe0c3e999ea9b1e1c 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -339,9 +339,9 @@ typedef int each_packed_object_fn(const struct object_id *oid,
                                  void *data);
 int for_each_object_in_pack(struct packed_git *p,
                            each_packed_object_fn, void *data,
-                           enum for_each_object_flags flags);
+                           enum odb_for_each_object_flags flags);
 int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
-                          void *data, enum for_each_object_flags flags);
+                          void *data, enum odb_for_each_object_flags flags);
 
 /* A hook to report invalid files in pack directory */
 #define PACKDIR_FILE_PACK 1

diff --git a/reachable.c b/reachable.c
index 4b532039d5f84fbfeafbe9184a17c0e022f13e8b..82676b2668090d89c36e30211db5b771ab8bb9e2 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -307,7 +307,7 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
                                           int ignore_in_core_kept_packs)
 {
        struct recent_data data;
-       enum for_each_object_flags flags;
+       enum odb_for_each_object_flags flags;
        int r;
 
        data.revs = revs;
@@ -319,13 +319,13 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
        data.extra_recent_oids_loaded = 0;
 
        r = for_each_loose_object(the_repository->objects, add_recent_loose, &data,
-                                 FOR_EACH_OBJECT_LOCAL_ONLY);
+                                 ODB_FOR_EACH_OBJECT_LOCAL_ONLY);
        if (r)
                goto done;
 
-       flags = FOR_EACH_OBJECT_LOCAL_ONLY | FOR_EACH_OBJECT_PACK_ORDER;
+       flags = ODB_FOR_EACH_OBJECT_LOCAL_ONLY | ODB_FOR_EACH_OBJECT_PACK_ORDER;
        if (ignore_in_core_kept_packs)
-               flags |= FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS;
+               flags |= ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS;
 
        r = for_each_packed_object(revs->repo, add_recent_packed, &data, flags);
 

diff --git a/repack-promisor.c b/repack-promisor.c
index ee6e0669f656028a4f59389d0ba0b8ff637526c3..45c330b9a53ae6d77b8cc362efbd03d6cdc678da 100644 (file)
--- a/repack-promisor.c
+++ b/repack-promisor.c
@@ -56,7 +56,7 @@ void repack_promisor_objects(struct repository *repo,
        ctx.cmd = &cmd;
        ctx.algop = repo->hash_algo;
        for_each_packed_object(repo, write_oid, &ctx,
-                              FOR_EACH_OBJECT_PROMISOR_ONLY);
+                              ODB_FOR_EACH_OBJECT_PROMISOR_ONLY);
 
        if (cmd.in == -1) {
                /* No packed objects; cmd was never started */

diff --git a/revision.c b/revision.c
index b65a76377062cd6eaa823a652c7b5a85d41a894d..5aadf46dac2b9d10c8428d6647c6bdb06b6710f7 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -3938,7 +3938,7 @@ int prepare_revision_walk(struct rev_info *revs)
 
        if (revs->exclude_promisor_objects) {
                for_each_packed_object(revs->repo, mark_uninteresting, revs,
-                                      FOR_EACH_OBJECT_PROMISOR_ONLY);
+                                      ODB_FOR_EACH_OBJECT_PROMISOR_ONLY);
        }
 
        if (!revs->reflog_info)