db5360f3f496 (name-hash: refactor polymorphic index_name_exists(); 2013-09-17) split index_name_exists() into index_file_exists() and index_dir_exists() but retained index_name_exists() as a thin wrapper to avoid disturbing possible in-flight topics. Since this change landed in 'master' some time ago and there are no in-flight topics referencing index_name_exists(), retire it.
Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- The only difference from v1 [1] is that a comment added by kb/fast-hashmap in 'next' referencing obsolete index_name_exists() is also adjusted. [1]: http://article.gmane.org/gmane.comp.version-control.git/239575/ cache.h | 2 -- name-hash.c | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cache.h b/cache.h index 2a21fbc..d0d1f2b 100644 --- a/cache.h +++ b/cache.h @@ -316,7 +316,6 @@ extern void free_name_hash(struct index_state *istate); #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options)) #define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), (namelen)) #define cache_file_exists(name, namelen, igncase) index_file_exists(&the_index, (name), (namelen), (igncase)) -#define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase)) #define cache_name_is_other(name, namelen) index_name_is_other(&the_index, (name), (namelen)) #define resolve_undo_clear() resolve_undo_clear_index(&the_index) #define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at) @@ -466,7 +465,6 @@ extern int unmerged_index(const struct index_state *); extern int verify_path(const char *path); extern struct cache_entry *index_dir_exists(struct index_state *istate, const char *name, int namelen); extern struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase); -extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase); extern int index_name_pos(const struct index_state *, const char *name, int namelen); #define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */ #define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */ diff --git a/name-hash.c b/name-hash.c index 9a3bd3f..97444d0 100644 --- a/name-hash.c +++ b/name-hash.c @@ -115,7 +115,7 @@ static int cache_entry_cmp(const struct cache_entry *ce1, { /* * For remove_name_hash, find the exact entry (pointer equality); for - * index_name_exists, find all entries with matching hash code and + * index_file_exists, find all entries with matching hash code and * decide whether the entry matches in same_name. */ return remove ? !(ce1 == ce2) : 0; @@ -227,13 +227,6 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na return NULL; } -struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int icase) -{ - if (namelen > 0 && name[namelen - 1] == '/') - return index_dir_exists(istate, name, namelen - 1); - return index_file_exists(istate, name, namelen, icase); -} - void free_name_hash(struct index_state *istate) { if (!istate->name_hash_initialized) -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
