employ new explicit "exists in index?" API

Each caller of index_name_exists() knows whether it is looking for a
directory or a file, and can avoid the unnecessary indirection of
index_name_exists() by instead calling index_dir_exists() or
index_file_exists() directly.

Invoking the appropriate search function explicitly will allow a
subsequent patch to relieve callers of the artificial burden of having
to add a trailing '/' to the pathname given to index_dir_exists().

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir.c b/dir.c
index b439ff0e63481bebb4039901b029bad978b46929..a8401b97ce94192fb3c32c46912d53c94ea56063 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -860,7 +860,7 @@ static struct dir_entry *dir_entry_new(const char *pathname, int len)
 
 static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len)
 {
 
 static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len)
 {

-       if (cache_name_exists(pathname, len, ignore_case))
+       if (cache_file_exists(pathname, len, ignore_case))

                return NULL;
 
        ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);
                return NULL;
 
        ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);


@@ -885,11 +885,11 @@ enum exist_status {
 /*
  * Do not use the alphabetically sorted index to look up
  * the directory name; instead, use the case insensitive
 /*
  * Do not use the alphabetically sorted index to look up
  * the directory name; instead, use the case insensitive

- * name hash.
+ * directory hash.

  */
 static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
 {
  */
 static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
 {

-       const struct cache_entry *ce = cache_name_exists(dirname, len + 1, ignore_case);
+       const struct cache_entry *ce = cache_dir_exists(dirname, len + 1);

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


@@ -1071,7 +1071,7 @@ static int get_index_dtype(const char *path, int len)
        int pos;
        const struct cache_entry *ce;
 
        int pos;
        const struct cache_entry *ce;
 

-       ce = cache_name_exists(path, len, 0);
+       ce = cache_file_exists(path, len, 0);

        if (ce) {
                if (!ce_uptodate(ce))
                        return DT_UNKNOWN;
        if (ce) {
                if (!ce_uptodate(ce))
                        return DT_UNKNOWN;


@@ -1131,7 +1131,7 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
                                          int dtype, struct dirent *de)
 {
        int exclude;
                                          int dtype, struct dirent *de)
 {
        int exclude;

-       int has_path_in_index = !!cache_name_exists(path->buf, path->len, ignore_case);
+       int has_path_in_index = !!cache_file_exists(path->buf, path->len, ignore_case);

 
        if (dtype == DT_UNKNOWN)
                dtype = get_dtype(de, path->buf, path->len);
 
        if (dtype == DT_UNKNOWN)
                dtype = get_dtype(de, path->buf, path->len);

diff --git a/read-cache.c b/read-cache.c
index 885943a6df77da646481c34d2876d7fdaa5c12b8..b8d3759b53c573075b0bd7af9ff1f7fb29b2715a 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -643,7 +643,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
                        if (*ptr == '/') {
                                struct cache_entry *foundce;
                                ++ptr;
                        if (*ptr == '/') {
                                struct cache_entry *foundce;
                                ++ptr;

-                               foundce = index_name_exists(istate, ce->name, ptr - ce->name, ignore_case);
+                               foundce = index_dir_exists(istate, ce->name, ptr - ce->name);

                                if (foundce) {
                                        memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
                                        startPtr = ptr;
                                if (foundce) {
                                        memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
                                        startPtr = ptr;


@@ -652,7 +652,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
                }
        }
 
                }
        }
 

-       alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case);
+       alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);

        if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
                /* Nothing changed, really */
                free(ce);
        if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
                /* Nothing changed, really */
                free(ce);

diff --git a/unpack-trees.c b/unpack-trees.c
index 1a61e6f363d6a03b262ad5e5a28c58c2caf722d5..35cb05e92bed9fb273747adc4718458b9f500898 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1357,7 +1357,7 @@ static int icase_exists(struct unpack_trees_options *o, const char *name, int le
 {
        const struct cache_entry *src;
 
 {
        const struct cache_entry *src;
 

-       src = index_name_exists(o->src_index, name, len, 1);
+       src = index_file_exists(o->src_index, name, len, 1);

        return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
 }
 
        return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
 }
 


@@ -1403,7 +1403,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
         * delete this path, which is in a subdirectory that
         * is being replaced with a blob.
         */
         * delete this path, which is in a subdirectory that
         * is being replaced with a blob.
         */

-       result = index_name_exists(&o->result, name, len, 0);
+       result = index_file_exists(&o->result, name, len, 0);

        if (result) {
                if (result->ce_flags & CE_REMOVE)
                        return 0;
        if (result) {
                if (result->ce_flags & CE_REMOVE)
                        return 0;