diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-02-02 13:09:32 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-02-17 11:41:06 +0100 |
| commit | 8f1ff26bd3c46d7f4f20b6776fd2edac647f3335 (patch) | |
| tree | 3810eea20d5acbb373c34874cf115cb01998f1d6 | |
| parent | cee9ca6609466c63886218290e9ecad5f703094b (diff) | |
| download | libgit2-8f1ff26bd3c46d7f4f20b6776fd2edac647f3335.tar.gz | |
idxmap: remove GIT__USE_IDXMAP
| -rw-r--r-- | src/idxmap.c | 16 | ||||
| -rw-r--r-- | src/idxmap.h | 18 | ||||
| -rw-r--r-- | src/index.c | 3 |
3 files changed, 14 insertions, 23 deletions
diff --git a/src/idxmap.c b/src/idxmap.c index 490824017..10f55ad39 100644 --- a/src/idxmap.c +++ b/src/idxmap.c @@ -7,8 +7,20 @@ #include "idxmap.h" -GIT__USE_IDXMAP -GIT__USE_IDXMAP_ICASE +/* This is __ac_X31_hash_string but with tolower and it takes the entry's stage into account */ +static kh_inline khint_t idxentry_hash(const git_index_entry *e) +{ + const char *s = e->path; + khint_t h = (khint_t)git__tolower(*s); + if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)git__tolower(*s); + return h + GIT_IDXENTRY_STAGE(e); +} + +#define idxentry_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcmp(a->path, b->path) == 0) +#define idxentry_icase_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0) + +__KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal) +__KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal) int git_idxmap_alloc(git_idxmap **map) { diff --git a/src/idxmap.h b/src/idxmap.h index aaca50b48..e4e9ec4cd 100644 --- a/src/idxmap.h +++ b/src/idxmap.h @@ -26,24 +26,6 @@ typedef khash_t(idxicase) git_idxmap_icase; typedef khiter_t git_idxmap_iter; -/* This is __ac_X31_hash_string but with tolower and it takes the entry's stage into account */ -static kh_inline khint_t idxentry_hash(const git_index_entry *e) -{ - const char *s = e->path; - khint_t h = (khint_t)git__tolower(*s); - if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)git__tolower(*s); - return h + GIT_IDXENTRY_STAGE(e); -} - -#define idxentry_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcmp(a->path, b->path) == 0) -#define idxentry_icase_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0) - -#define GIT__USE_IDXMAP \ - __KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal) - -#define GIT__USE_IDXMAP_ICASE \ - __KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal) - int git_idxmap_alloc(git_idxmap **map); int git_idxmap_icase_alloc(git_idxmap_icase **map); void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval); diff --git a/src/index.c b/src/index.c index 7b510e04e..932a5306a 100644 --- a/src/index.c +++ b/src/index.c @@ -27,9 +27,6 @@ #include "git2/config.h" #include "git2/sys/index.h" -GIT__USE_IDXMAP -GIT__USE_IDXMAP_ICASE - #define INSERT_IN_MAP_EX(idx, map, e, err) do { \ if ((idx)->ignore_case) \ git_idxmap_icase_insert((khash_t(idxicase) *) (map), (e), (e), (err)); \ |