{"thread":{"id":"35598","subject":"[PATCH v2] name-hash: retire unused index_name_exists()","startedAt":"2014-01-02T21:57:12Z","lastAt":"2014-01-02T21:57:12Z","messageCount":1,"participants":["Eric Sunshine"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"232593","messageId":"1388699832-4075-1-git-send-email-sunshine@sunshineco.com","threadId":"35598","inReplyTo":null,"subject":"[PATCH v2] name-hash: retire unused index_name_exists()","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2014-01-02T21:57:12Z","receivedAt":"2014-01-02T21:57:12Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"db5360f3f496 (name-hash: refactor polymorphic index_name_exists();\n2013-09-17) split index_name_exists() into index_file_exists() and\nindex_dir_exists() but retained index_name_exists() as a thin wrapper\nto avoid disturbing possible in-flight topics. Since this change\nlanded in 'master' some time ago and there are no in-flight topics\nreferencing index_name_exists(), retire it.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n\nThe only difference from v1 [1] is that a comment added by\nkb/fast-hashmap in 'next' referencing obsolete index_name_exists()\nis also adjusted.\n\n[1]: http://article.gmane.org/gmane.comp.version-control.git/239575/\n\n\n cache.h     | 2 --\n name-hash.c | 9 +--------\n 2 files changed, 1 insertion(+), 10 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex 2a21fbc..d0d1f2b 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -316,7 +316,6 @@ extern void free_name_hash(struct index_state *istate);\n #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))\n #define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), (namelen))\n #define cache_file_exists(name, namelen, igncase) index_file_exists(&the_index, (name), (namelen), (igncase))\n-#define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase))\n #define cache_name_is_other(name, namelen) index_name_is_other(&the_index, (name), (namelen))\n #define resolve_undo_clear() resolve_undo_clear_index(&the_index)\n #define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)\n@@ -466,7 +465,6 @@ extern int unmerged_index(const struct index_state *);\n extern int verify_path(const char *path);\n extern struct cache_entry *index_dir_exists(struct index_state *istate, const char *name, int namelen);\n extern struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase);\n-extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);\n extern int index_name_pos(const struct index_state *, const char *name, int namelen);\n #define ADD_CACHE_OK_TO_ADD 1\t\t/* Ok to add */\n #define ADD_CACHE_OK_TO_REPLACE 2\t/* Ok to replace file/directory */\ndiff --git a/name-hash.c b/name-hash.c\nindex 9a3bd3f..97444d0 100644\n--- a/name-hash.c\n+++ b/name-hash.c\n@@ -115,7 +115,7 @@ static int cache_entry_cmp(const struct cache_entry *ce1,\n {\n \t/*\n \t * For remove_name_hash, find the exact entry (pointer equality); for\n-\t * index_name_exists, find all entries with matching hash code and\n+\t * index_file_exists, find all entries with matching hash code and\n \t * decide whether the entry matches in same_name.\n \t */\n \treturn remove ? !(ce1 == ce2) : 0;\n@@ -227,13 +227,6 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na\n \treturn NULL;\n }\n \n-struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int icase)\n-{\n-\tif (namelen > 0 && name[namelen - 1] == '/')\n-\t\treturn index_dir_exists(istate, name, namelen - 1);\n-\treturn index_file_exists(istate, name, namelen, icase);\n-}\n-\n void free_name_hash(struct index_state *istate)\n {\n \tif (!istate->name_hash_initialized)\n-- \n1.8.3.2\n"}]}