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 <peff@peff.net>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/khash.h b/khash.h
index 56241e6a5c9a4c88a4201f082c2040035e60ed95..a0a08dad8b7cd7bc666f940fb6fbfc26e1fccbf9 100644 (file)
--- a/khash.h
+++ b/khash.h
@@ -62,7 +62,7 @@ static inline khint_t __ac_X31_hash_string(const char *s)
 static const double __ac_HASH_UPPER = 0.77;
 
 #define __KHASH_TYPE(name, khkey_t, khval_t) \
-       typedef struct { \
+       typedef struct kh_##name { \
                khint_t n_buckets, size, n_occupied, upper_bound; \
                khint32_t *flags; \
                khkey_t *keys; \

diff --git a/object-store.h b/object-store.h
index 12415e5ea739d74df5f351ab5da41bcd862827aa..05803a03e922bbf1a8c2b43af42f957a05606e8d 100644 (file)
--- 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;