diff options
| author | Patrick Steinhardt <ps@pks.im> | 2018-11-23 19:26:24 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2018-11-28 15:22:27 +0100 |
| commit | 852bc9f4967d3bd70a284794ff486253e37c6980 (patch) | |
| tree | 5c4857b20cc036e281a3913019924bb4ba4f4feb /src/submodule.c | |
| parent | 5bfb3b58e37fc35a0838ca2fa8b38941e056cfcc (diff) | |
| download | libgit2-852bc9f4967d3bd70a284794ff486253e37c6980.tar.gz | |
khash: remove intricate knowledge of khash types
Instead of using the `khiter_t`, `git_strmap_iter` and `khint_t` types,
simply use `size_t` instead. This decouples code from the khash stuff
and makes it possible to move the khash includes into the implementation
files.
Diffstat (limited to 'src/submodule.c')
| -rw-r--r-- | src/submodule.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/submodule.c b/src/submodule.c index 315771614..45cb95766 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -267,7 +267,7 @@ int git_submodule_lookup( } if (repo->submodule_cache != NULL) { - khiter_t pos = git_strmap_lookup_index(repo->submodule_cache, name); + size_t pos = git_strmap_lookup_index(repo->submodule_cache, name); if (git_strmap_valid_index(repo->submodule_cache, pos)) { if (out) { *out = git_strmap_value_at(repo->submodule_cache, pos); @@ -396,7 +396,7 @@ static void submodule_free_dup(void *sm) static int submodule_get_or_create(git_submodule **out, git_repository *repo, git_strmap *map, const char *name) { int error = 0; - khiter_t pos; + size_t pos; git_submodule *sm = NULL; pos = git_strmap_lookup_index(map, name); @@ -439,7 +439,7 @@ static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cf goto done; while (!(error = git_iterator_advance(&entry, i))) { - khiter_t pos = git_strmap_lookup_index(map, entry->path); + size_t pos = git_strmap_lookup_index(map, entry->path); git_submodule *sm; if (git_strmap_valid_index(map, pos)) { @@ -450,7 +450,7 @@ static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cf else sm->flags |= GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE; } else if (S_ISGITLINK(entry->mode)) { - khiter_t name_pos; + size_t name_pos; const char *name; name_pos = git_strmap_lookup_index(names, entry->path); @@ -491,7 +491,7 @@ static int submodules_from_head(git_strmap *map, git_tree *head, git_config *cfg goto done; while (!(error = git_iterator_advance(&entry, i))) { - khiter_t pos = git_strmap_lookup_index(map, entry->path); + size_t pos = git_strmap_lookup_index(map, entry->path); git_submodule *sm; if (git_strmap_valid_index(map, pos)) { @@ -502,7 +502,7 @@ static int submodules_from_head(git_strmap *map, git_tree *head, git_config *cfg else sm->flags |= GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE; } else if (S_ISGITLINK(entry->mode)) { - khiter_t name_pos; + size_t name_pos; const char *name; name_pos = git_strmap_lookup_index(names, entry->path); @@ -1935,7 +1935,7 @@ static int submodule_load_each(const git_config_entry *entry, void *payload) { lfc_data *data = payload; const char *namestart, *property; - git_strmap_iter pos; + size_t pos; git_strmap *map = data->map; git_buf name = GIT_BUF_INIT; git_submodule *sm; |