[PATCH 3/6] object-file: move empty_tree struct into find_cached_object()
- From
Jeff King <peff@peff.net>
- Date
- Nov 18, 2024, 09:55 UTC
- Message-ID
- <20241118095511.GC3992317@coredump.intra.peff.net>
- In-Reply-To
- <20241118095423.GA3990835@coredump.intra.peff.net>
The fake empty_tree struct is a static global, but the only code that looks at it is find_cached_object(). The struct itself is a little odd, with an invalid "oid" field that is handled specially by that function.
Since it's really just an implementation detail, let's move it to a static within the function. That future-proofs against other code trying to use it and seeing the weird oid value.
Signed-off-by: Jeff King <peff@peff.net> --- object-file.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/object-file.c b/object-file.c index 19fc4afa43..4d4280543e 100644 --- a/object-file.c +++ b/object-file.c @@ -325,14 +325,13 @@ static struct cached_object { } *cached_objects; static int cached_object_nr, cached_object_alloc; -static struct cached_object empty_tree = { - /* no oid needed; we'll look it up manually based on the_hash_algo */ - .type = OBJ_TREE, - .buf = "", -}; - static struct cached_object *find_cached_object(const struct object_id *oid) { + static struct cached_object empty_tree = { + /* no oid needed; we'll look it up manually based on the_hash_algo */ + .type = OBJ_TREE, + .buf = "", + }; int i; struct cached_object *co = cached_objects;
-- 2.47.0.547.g778689293a