diff options
| author | Karsten Blees <karsten.blees@gmail.com> | 2014-07-03 00:22:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-07 13:56:35 -0700 |
| commit | ab73a9d119240b0b908ccb9edd19b8e536ce29b9 (patch) | |
| tree | d942c8d2777fa05d082819c998d64c7434ccec42 /diffcore-rename.c | |
| parent | aa420c48eaea5c89946b8753363d09955300133f (diff) | |
| download | git-ab73a9d119240b0b908ccb9edd19b8e536ce29b9.tar.gz | |
hashmap: add simplified hashmap_get_from_hash() API
Hashmap entries are typically looked up by just a key. The hashmap_get()
API expects an initialized entry structure instead, to support compound
keys. This flexibility is currently only needed by find_dir_entry() in
name-hash.c (and compat/win32/fscache.c in the msysgit fork). All other
(currently five) call sites of hashmap_get() have to set up a near emtpy
entry structure, resulting in duplicate code like this:
struct hashmap_entry keyentry;
hashmap_entry_init(&keyentry, hash(key));
return hashmap_get(map, &keyentry, key);
Add a hashmap_get_from_hash() API that allows hashmap lookups by just
specifying the key and its hash code, i.e.:
return hashmap_get_from_hash(map, hash(key), key);
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 6fa97d4433..2e44a37459 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -257,15 +257,14 @@ static int find_identical_files(struct hashmap *srcs, int renames = 0; struct diff_filespec *target = rename_dst[dst_index].two; - struct file_similarity *p, *best, dst; + struct file_similarity *p, *best = NULL; int i = 100, best_score = -1; /* * Find the best source match for specified destination. */ - best = NULL; - hashmap_entry_init(&dst, hash_filespec(target)); - for (p = hashmap_get(srcs, &dst, NULL); p; p = hashmap_get_next(srcs, p)) { + p = hashmap_get_from_hash(srcs, hash_filespec(target), NULL); + for (; p; p = hashmap_get_next(srcs, p)) { int score; struct diff_filespec *source = p->filespec; |