[PATCH 055/194] replace-object: add repository argument to replace_object_pos
- From
Stefan Beller <sbeller@google.com>
- Date
- Feb 5, 2018, 23:55 UTC
- Message-ID
- <20180205235735.216710-35-sbeller@google.com>
- In-Reply-To
- <20180205235735.216710-1-sbeller@google.com>
Add a repository argument to allow the replace_object_pos caller to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet.
As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> --- replace-object.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/replace-object.c b/replace-object.c index 8d3e0a30fb..4a07f82aa0 100644 --- a/replace-object.c +++ b/replace-object.c @@ -11,7 +11,9 @@ static const unsigned char *replace_sha1_access(size_t index, void *table) return replace[index]->original; } -static int replace_object_pos(const unsigned char *sha1) +#define replace_object_pos(r, s) \ + replace_object_pos_##r(s) +static int replace_object_pos_the_repository(const unsigned char *sha1) { return sha1_pos(sha1, the_repository->objects.replacements.items, the_repository->objects.replacements.nr, @@ -23,7 +25,7 @@ static int replace_object_pos(const unsigned char *sha1) static int register_replace_object_the_repository(struct replace_object *replace, int ignore_dups) { - int pos = replace_object_pos(replace->original); + int pos = replace_object_pos(the_repository, replace->original); if (0 <= pos) { if (ignore_dups) @@ -108,7 +110,7 @@ const unsigned char *do_lookup_replace_object_the_repository(const unsigned char die("replace depth too high for object %s", sha1_to_hex(sha1)); - pos = replace_object_pos(cur); + pos = replace_object_pos(the_repository, cur); if (0 <= pos) cur = the_repository->objects.replacements.items[pos]->replacement; } while (0 <= pos);
-- 2.15.1.433.g936d1b9894.dirty