khash: rename oid helper functions
For use in object_id hash tables, we have oid_hash() and oid_equal(). But these are confusingly similar to the existing oideq() and the oidhash() we plan to add to replace sha1hash(). The big difference from those functions is that rather than accepting a const pointer to the "struct object_id", we take the arguments by value (which is a khash internal convention). So let's make that obvious by calling them oidhash_by_value() and oideq_by_value(). Those names are fairly horrendous to type, but we rarely need to do so; they are passed to the khash implementation macro and then only used internally. Callers get to use the nice kh_put_oid_map(), etc. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jun 20, 2019 at 03:41 UTC
e465e7c41d5104b48a16b122a666cbbfa184c25d
1 file changed
+5
-5
khash.h
+5
-5
@@ -324,20 +324,20 @@ static const double __ac_HASH_UPPER = 0.77;
324
code; \
325
} }
326
327
-static inline unsigned int oid_hash(struct object_id oid)
327
+static inline unsigned int oidhash_by_value(struct object_id oid)
328
{
329
return sha1hash(oid.hash);
330
}
331
332
-static inline int oid_equal(struct object_id a, struct object_id b)
332
+static inline int oideq_by_value(struct object_id a, struct object_id b)
333
{
334
return oideq(&a, &b);
335
}
336
337
-KHASH_INIT(oid_set, struct object_id, int, 0, oid_hash, oid_equal)
337
+KHASH_INIT(oid_set, struct object_id, int, 0, oidhash_by_value, oideq_by_value)
338
339
-KHASH_INIT(oid_map, struct object_id, void *, 1, oid_hash, oid_equal)
339
+KHASH_INIT(oid_map, struct object_id, void *, 1, oidhash_by_value, oideq_by_value)
340
341
-KHASH_INIT(oid_pos, struct object_id, int, 1, oid_hash, oid_equal)
341
+KHASH_INIT(oid_pos, struct object_id, int, 1, oidhash_by_value, oideq_by_value)
342
343
#endif /* __AC_KHASH_H */