From 8043418b77a0942cd3291f2bca56a0263b6d9967 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 16 May 2023 06:34:05 +0000 Subject: khash: name the structs that khash declares khash.h lets you instantiate custom hash types that map between two types. These are defined as a struct, as you might expect, and khash typedef's that to kh_foo_t. But it declares the struct anonymously, which doesn't give a name to the struct type itself; there is no "struct kh_foo". This has two small downsides: - when using khash, we declare "kh_foo_t *the_foo". This is unlike our usual naming style, which is "struct kh_foo *the_foo". - you can't forward-declare a typedef of an unnamed struct type in C. So we might do something like this in a header file: struct kh_foo; struct bar { struct kh_foo *the_foo; }; to avoid having to include the header that defines the real kh_foo. But that doesn't work with the typedef'd name. Without the "struct" keyword, the compiler doesn't know we mean that kh_foo is a type. So let's always give khash structs the name that matches our conventions ("struct kh_foo" to match "kh_foo_t"). We'll keep doing the typedef to retain compatibility with existing callers. Co-authored-by: Jeff King Signed-off-by: Jeff King Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- object-store.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'object-store.h') diff --git a/object-store.h b/object-store.h index 12415e5ea7..05803a03e9 100644 --- a/object-store.h +++ b/object-store.h @@ -164,7 +164,7 @@ struct raw_object_store { */ struct object_directory *odb; struct object_directory **odb_tail; - kh_odb_path_map_t *odb_by_path; + struct kh_odb_path_map *odb_by_path; int loaded_alternates; -- cgit v1.3-5-g45d5