From cc216a01ee512a41320056efc9b588daf9129f7a Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 5 Mar 2013 16:29:04 -0800 Subject: Retire spoolandsort iterator Since the case sensitivity is moved into the respective iterators, this removes the spoolandsort iterator code. --- src/iterator.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/iterator.h') diff --git a/src/iterator.h b/src/iterator.h index feb0c2271..24c7b7765 100644 --- a/src/iterator.h +++ b/src/iterator.h @@ -19,7 +19,6 @@ typedef enum { GIT_ITERATOR_TYPE_TREE = 1, GIT_ITERATOR_TYPE_INDEX = 2, GIT_ITERATOR_TYPE_WORKDIR = 3, - GIT_ITERATOR_TYPE_SPOOLANDSORT = 4 } git_iterator_type_t; typedef enum { @@ -86,14 +85,6 @@ extern int git_iterator_for_workdir( extern void git_iterator_free(git_iterator *iter); -/* Spool all iterator values, resort with alternative ignore_case value - * and replace callbacks with spoolandsort alternates. - */ -extern int git_iterator_spoolandsort_push(git_iterator *iter, bool ignore_case); - -/* Restore original callbacks - not required in most circumstances */ -extern void git_iterator_spoolandsort_pop(git_iterator *iter); - /* Return a git_index_entry structure for the current value the iterator * is looking at or NULL if the iterator is at the end. * @@ -154,6 +145,8 @@ GIT_INLINE(bool) git_iterator_ignore_case(git_iterator *iter) return ((iter->flags & GIT_ITERATOR_IGNORE_CASE) != 0); } +extern int git_iterator_set_ignore_case(git_iterator *iter, bool ignore_case); + extern int git_iterator_current_tree_entry( const git_tree_entry **tree_entry, git_iterator *iter); @@ -196,6 +189,4 @@ extern int git_iterator_current_workdir_path( /* Return index pointer if index iterator, else NULL */ extern git_index *git_iterator_get_index(git_iterator *iter); -extern git_iterator_type_t git_iterator_inner_type(git_iterator *iter); - #endif -- cgit v1.2.3