diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2013-12-20 11:05:06 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 17:07:07 -0800 |
| commit | 1c1e1b1fee6cb5ad7f1c753e83c2e1c2ae013fb3 (patch) | |
| tree | 90f7f17f56acbd972451fafb814bb5dd0d7435ee | |
| parent | d6a58b7773d142ab6da47eca94f83b9c8e6dad5e (diff) | |
| download | git-es/retire-index-name-exists.tar.gz | |
name-hash: retire unused index_name_exists()es/retire-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>
| -rw-r--r-- | cache.h | 2 | ||||
| -rw-r--r-- | name-hash.c | 7 |
2 files changed, 0 insertions, 9 deletions
@@ -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) @@ -467,7 +466,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 e5b6e1ad23..715f95c10f 100644 --- a/name-hash.c +++ b/name-hash.c @@ -263,13 +263,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); -} - static int free_dir_entry(void *entry, void *unused) { struct dir_entry *dir = entry; |