diff options
author | Jeff King <peff@peff.net> | 2019-06-20 03:41:49 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-20 10:44:22 -0700 |
commit | d40abc8e95f75b529feb140178b69a3783c2d108 (patch) | |
tree | d0de753e3ef3e66b033f2b179441e504f71aa4a0 /hashmap.h | |
parent | c0566d78aac1d5f8ff90c75f2d936487bb5a8d84 (diff) | |
download | git-d40abc8e95f75b529feb140178b69a3783c2d108.tar.gz |
hashmap: convert sha1hash() to oidhash()
There are no callers left of sha1hash() that do not simply pass the
"hash" member of a "struct object_id". Let's get rid of the outdated
sha1-specific function and provide one that operates on the whole struct
(even though the technique, taking the first few bytes of the hash, will
remain the same).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hashmap.h')
-rw-r--r-- | hashmap.h | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,6 +1,8 @@ #ifndef HASHMAP_H #define HASHMAP_H +#include "hash.h" + /* * Generic implementation of hash-based key-value mappings. * @@ -118,14 +120,14 @@ unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len); * the results will be different on big-endian and little-endian * platforms, so they should not be stored or transferred over the net. */ -static inline unsigned int sha1hash(const unsigned char *sha1) +static inline unsigned int oidhash(const struct object_id *oid) { /* - * Equivalent to 'return *(unsigned int *)sha1;', but safe on + * Equivalent to 'return *(unsigned int *)oid->hash;', but safe on * platforms that don't support unaligned reads. */ unsigned int hash; - memcpy(&hash, sha1, sizeof(hash)); + memcpy(&hash, oid->hash, sizeof(hash)); return hash; } |