dir.c: use the cache_* macro to access the current index

These codepaths always start from the_index and use index_*
functions, but there is no reason to do so.  Use the compatibility
cache_* macro to access the current in-core index like everybody
else.

While at it, fix typo in the comment for a function to check if a
path within a directory appears in the index.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir.c b/dir.c
index a5926fbd1aeafd468860da7dbd3d8a5d5999a650..2f82cd193e5753ac7ecb7cdda66e8e587aaa1b7f 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -472,15 +472,14 @@ static void *read_skip_worktree_file_from_index(const char *path, size_t *size)
        unsigned long sz;
        enum object_type type;
        void *data;
        unsigned long sz;
        enum object_type type;
        void *data;

-       struct index_state *istate = &the_index;

 
        len = strlen(path);
 
        len = strlen(path);

-       pos = index_name_pos(istate, path, len);
+       pos = cache_name_pos(path, len);

        if (pos < 0)
                return NULL;
        if (pos < 0)
                return NULL;

-       if (!ce_skip_worktree(istate->cache[pos]))
+       if (!ce_skip_worktree(active_cache[pos]))

                return NULL;
                return NULL;

-       data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
+       data = read_sha1_file(active_cache[pos]->sha1, &type, &sz);

        if (!data || type != OBJ_BLOB) {
                free(data);
                return NULL;
        if (!data || type != OBJ_BLOB) {
                free(data);
                return NULL;


@@ -924,13 +923,13 @@ enum exist_status {
 };
 
 /*
 };
 
 /*

- * Do not use the alphabetically stored index to look up
+ * Do not use the alphabetically sorted index to look up

  * the directory name; instead, use the case insensitive
  * name hash.
  */
 static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
 {
  * the directory name; instead, use the case insensitive
  * name hash.
  */
 static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
 {

-       struct cache_entry *ce = index_name_exists(&the_index, dirname, len + 1, ignore_case);
+       struct cache_entry *ce = cache_name_exists(dirname, len + 1, ignore_case);

        unsigned char endchar;
 
        if (!ce)
        unsigned char endchar;
 
        if (!ce)