summaryrefslogtreecommitdiff
path: root/src/idxmap.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2018-11-28 13:31:06 +0000
committerEdward Thomson <ethomson@edwardthomson.com>2018-12-01 10:46:44 +0000
commit18e71e6d597abe6c7feb666429c921bd19dc0ba8 (patch)
tree623f04b779ae57c2783b13d8c73d8bd215772721 /src/idxmap.c
parent19faf7c5fcd24fab789d9b7a619b343c1fae7c86 (diff)
downloadlibgit2-18e71e6d597abe6c7feb666429c921bd19dc0ba8.tar.gz
index: use new enum and structure names
Use the new-style index names throughout our own codebase.
Diffstat (limited to 'src/idxmap.c')
-rw-r--r--src/idxmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/idxmap.c b/src/idxmap.c
index 05a7b2feb..edf8fff5a 100644
--- a/src/idxmap.c
+++ b/src/idxmap.c
@@ -23,11 +23,11 @@ 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);
+ return h + GIT_INDEX_ENTRY_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 idxentry_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_STAGE(b) && strcmp(a->path, b->path) == 0)
+#define idxentry_icase_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_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)