diff options
author | Jeff King <peff@peff.net> | 2019-06-20 10:41:28 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-20 20:27:48 +0300 |
commit | 8fbb558af4e911a9507295809a4d1d7d6687b6e1 (patch) | |
tree | cb4c73da524f619aff3cda2b4154620f5cc4232f /khash.h | |
parent | 4ed43d16d773ae5f717a258ce81a18ab3fb29435 (diff) |
khash: rename kh_oid_t to kh_oid_set
khash lets us define a hash as either a map or a set (i.e., with no
"value" type). For the oid maps we define, "oid" is the set and
"oid_map" is the map. As the bug in the previous commit shows, it's easy
to pick the wrong one.
So let's make the names more distinct: "oid_set" and "oid_map".
An alternative naming scheme would be to actually name the type after
the key/value types. So e.g., "oid" _would_ be the set, since it has no
value type. And "oid_map" would become "oid_void" or similar (and
"oid_pos" becomes "oid_int"). That's better in some ways: it's more
regular, and a given map type can be more reasily reused in multiple
contexts (e.g., something storing an "int" that isn't a "pos"). But it's
also slightly less descriptive.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'khash.h')
-rw-r--r-- | khash.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -342,7 +342,7 @@ static inline int oid_equal(struct object_id a, struct object_id b) return oideq(&a, &b); } -KHASH_INIT(oid, struct object_id, int, 0, oid_hash, oid_equal) +KHASH_INIT(oid_set, struct object_id, int, 0, oid_hash, oid_equal) KHASH_INIT(oid_map, struct object_id, void *, 1, oid_hash, oid_equal) |