name-hash: retire unused index_name_exists()
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 <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Jan 2, 2014 at 16:57 UTC
7b359ea6b3333a87fd3fa8b84913f2b75ed244ad
2 files changed
+1
-10
cache.h
-2
@@ -316,7 +316,6 @@ extern void free_name_hash(struct index_state *istate);
316
#define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
317
#define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), (namelen))
318
#define cache_file_exists(name, namelen, igncase) index_file_exists(&the_index, (name), (namelen), (igncase))
319
-#define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase))
319
#define cache_name_is_other(name, namelen) index_name_is_other(&the_index, (name), (namelen))
320
#define resolve_undo_clear() resolve_undo_clear_index(&the_index)
321
#define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)
@@ -467,7 +466,6 @@ extern int unmerged_index(const struct index_state *);
466
extern int verify_path(const char *path);
467
extern struct cache_entry *index_dir_exists(struct index_state *istate, const char *name, int namelen);
468
extern struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase);
470
-extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);
469
extern int index_name_pos(const struct index_state *, const char *name, int namelen);
470
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
471
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */
name-hash.c
+1
-8
@@ -115,7 +115,7 @@ static int cache_entry_cmp(const struct cache_entry *ce1,
115
{
116
/*
117
* For remove_name_hash, find the exact entry (pointer equality); for
118
- * index_name_exists, find all entries with matching hash code and
118
+ * index_file_exists, find all entries with matching hash code and
119
* decide whether the entry matches in same_name.
120
*/
121
return remove ? !(ce1 == ce2) : 0;
@@ -227,13 +227,6 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
227
return NULL;
228
}
229
230
-struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int icase)
231
-{
232
- if (namelen > 0 && name[namelen - 1] == '/')
233
- return index_dir_exists(istate, name, namelen - 1);
234
- return index_file_exists(istate, name, namelen, icase);
235
-}
236
-
230
void free_name_hash(struct index_state *istate)
231
{
232
if (!istate->name_hash_initialized)