mirror of
https://github.com/git/git.git
synced 2024-04-25 10:55:10 +02:00
d1cbe1e6d8
hash.h depends upon and includes repository.h, due to the definition and use of the_hash_algo (defined as the_repository->hash_algo). However, most headers trying to include hash.h are only interested in the layout of the structs like object_id. Move the parts of hash.h that do not depend upon repository.h into a new file hash-ll.h (the "low level" parts of hash.h), and adjust other files to use this new header where the convenience inline functions aren't needed. This allows hash.h and object.h to be fairly small, minimal headers. It also exposes a lot of hidden dependencies on both path.h (which was brought in by repository.h) and repository.h (which was previously implicitly brought in by object.h), so also adjust other files to be more explicit about what they depend upon. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
63 lines
1.5 KiB
C
63 lines
1.5 KiB
C
#include "git-compat-util.h"
|
|
#include "hash.h"
|
|
#include "oidmap.h"
|
|
|
|
static int oidmap_neq(const void *hashmap_cmp_fn_data UNUSED,
|
|
const struct hashmap_entry *e1,
|
|
const struct hashmap_entry *e2,
|
|
const void *keydata)
|
|
{
|
|
const struct oidmap_entry *a, *b;
|
|
|
|
a = container_of(e1, const struct oidmap_entry, internal_entry);
|
|
b = container_of(e2, const struct oidmap_entry, internal_entry);
|
|
|
|
if (keydata)
|
|
return !oideq(&a->oid, (const struct object_id *) keydata);
|
|
return !oideq(&a->oid, &b->oid);
|
|
}
|
|
|
|
void oidmap_init(struct oidmap *map, size_t initial_size)
|
|
{
|
|
hashmap_init(&map->map, oidmap_neq, NULL, initial_size);
|
|
}
|
|
|
|
void oidmap_free(struct oidmap *map, int free_entries)
|
|
{
|
|
if (!map)
|
|
return;
|
|
|
|
/* TODO: make oidmap itself not depend on struct layouts */
|
|
hashmap_clear_(&map->map, free_entries ? 0 : -1);
|
|
}
|
|
|
|
void *oidmap_get(const struct oidmap *map, const struct object_id *key)
|
|
{
|
|
if (!map->map.cmpfn)
|
|
return NULL;
|
|
|
|
return hashmap_get_from_hash(&map->map, oidhash(key), key);
|
|
}
|
|
|
|
void *oidmap_remove(struct oidmap *map, const struct object_id *key)
|
|
{
|
|
struct hashmap_entry entry;
|
|
|
|
if (!map->map.cmpfn)
|
|
oidmap_init(map, 0);
|
|
|
|
hashmap_entry_init(&entry, oidhash(key));
|
|
return hashmap_remove(&map->map, &entry, key);
|
|
}
|
|
|
|
void *oidmap_put(struct oidmap *map, void *entry)
|
|
{
|
|
struct oidmap_entry *to_put = entry;
|
|
|
|
if (!map->map.cmpfn)
|
|
oidmap_init(map, 0);
|
|
|
|
hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
|
|
return hashmap_put(&map->map, &to_put->internal_entry);
|
|
}
|