From 18e71e6d597abe6c7feb666429c921bd19dc0ba8 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 28 Nov 2018 13:31:06 +0000 Subject: index: use new enum and structure names Use the new-style index names throughout our own codebase. --- src/idxmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/idxmap.c') 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) -- cgit v1.2.1