diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-02-02 13:08:52 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-02-17 11:41:06 +0100 |
| commit | f14f75d4a1e656ac8df3fb6a512cc4a157641d8b (patch) | |
| tree | efd71a0eab0b62ffd40756dcfe42e0348a404bc6 | |
| parent | 73028af85c11bd947184a73c1e2d7902819695b2 (diff) | |
| download | libgit2-f14f75d4a1e656ac8df3fb6a512cc4a157641d8b.tar.gz | |
khash: avoid using `kh_resize` directly
| -rw-r--r-- | src/idxmap.h | 1 | ||||
| -rw-r--r-- | src/index.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/idxmap.h b/src/idxmap.h index e8fd3631a..21de5af78 100644 --- a/src/idxmap.h +++ b/src/idxmap.h @@ -71,6 +71,7 @@ static kh_inline khint_t idxentry_hash(const git_index_entry *e) #define git_idxmap_has_data(h, idx) kh_exist(h, idx) #define git_idxmap_resize(h,s) kh_resize(idx, h, s) +#define git_idxmap_icase_resize(h,s) kh_resize(idxicase, h, s) #define git_idxmap_free(h) kh_destroy(idx, h), h = NULL #define git_idxmap_clear(h) kh_clear(idx, h) diff --git a/src/index.c b/src/index.c index d7deae544..7b510e04e 100644 --- a/src/index.c +++ b/src/index.c @@ -2479,9 +2479,9 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size) assert(!index->entries.length); if (index->ignore_case) - kh_resize(idxicase, (khash_t(idxicase) *) index->entries_map, header.entry_count); + git_idxmap_icase_resize((khash_t(idxicase) *) index->entries_map, header.entry_count); else - kh_resize(idx, index->entries_map, header.entry_count); + git_idxmap_resize(index->entries_map, header.entry_count); /* Parse all the entries */ for (i = 0; i < header.entry_count && buffer_size > INDEX_FOOTER_SIZE; ++i) { @@ -2979,9 +2979,9 @@ int git_index_read_tree(git_index *index, const git_tree *tree) goto cleanup; if (index->ignore_case) - kh_resize(idxicase, (khash_t(idxicase) *) entries_map, entries.length); + git_idxmap_icase_resize((khash_t(idxicase) *) entries_map, entries.length); else - kh_resize(idx, entries_map, entries.length); + git_idxmap_resize(entries_map, entries.length); git_vector_foreach(&entries, i, e) { INSERT_IN_MAP_EX(index, entries_map, e, &error); @@ -3037,9 +3037,9 @@ static int git_index_read_iterator( goto done; if (index->ignore_case && new_length_hint) - kh_resize(idxicase, (khash_t(idxicase) *) new_entries_map, new_length_hint); + git_idxmap_icase_resize((khash_t(idxicase) *) new_entries_map, new_length_hint); else if (new_length_hint) - kh_resize(idx, new_entries_map, new_length_hint); + git_idxmap_resize(new_entries_map, new_length_hint); opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_CONFLICTS; |