From ac05086c40266bdd4541c06d3be532ee118ed204 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 25 Feb 2016 14:51:23 -0500 Subject: [PATCH] iterator: drop unused/unimplemented `seek` --- src/iterator.c | 29 ----------------------------- src/iterator.h | 8 -------- 2 files changed, 37 deletions(-) diff --git a/src/iterator.c b/src/iterator.c index cb1ea6a87..7b3ad40ed 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -17,7 +17,6 @@ (P)->cb.current = NAME_LC ## _iterator__current; \ (P)->cb.advance = NAME_LC ## _iterator__advance; \ (P)->cb.advance_into = NAME_LC ## _iterator__advance_into; \ - (P)->cb.seek = NAME_LC ## _iterator__seek; \ (P)->cb.reset = NAME_LC ## _iterator__reset; \ (P)->cb.at_end = NAME_LC ## _iterator__at_end; \ (P)->cb.free = NAME_LC ## _iterator__free; \ @@ -271,12 +270,6 @@ static int empty_iterator__noop(const git_index_entry **e, git_iterator *i) return GIT_ITEROVER; } -static int empty_iterator__seek(git_iterator *i, const char *p) -{ - GIT_UNUSED(i); GIT_UNUSED(p); - return -1; -} - static int empty_iterator__reset(git_iterator *i, const char *s, const char *e) { GIT_UNUSED(i); GIT_UNUSED(s); GIT_UNUSED(e); @@ -748,12 +741,6 @@ static int tree_iterator__advance_into( return tree_iterator__current(entry, self); } -static int tree_iterator__seek(git_iterator *self, const char *prefix) -{ - GIT_UNUSED(self); GIT_UNUSED(prefix); - return -1; -} - static int tree_iterator__reset( git_iterator *self, const char *start, const char *end) { @@ -1030,12 +1017,6 @@ static int index_iterator__advance_into( return index_iterator__current(entry, self); } -static int index_iterator__seek(git_iterator *self, const char *prefix) -{ - GIT_UNUSED(self); GIT_UNUSED(prefix); - return -1; -} - static int index_iterator__reset( git_iterator *self, const char *start, const char *end) { @@ -1498,16 +1479,6 @@ static int fs_iterator__advance( return fs_iterator__advance_over(entry, self); } -static int fs_iterator__seek(git_iterator *self, const char *prefix) -{ - GIT_UNUSED(self); - GIT_UNUSED(prefix); - /* pop stack until matching prefix */ - /* find prefix item in current frame */ - /* push subdirectories as deep as possible while matching */ - return 0; -} - static int fs_iterator__reset( git_iterator *self, const char *start, const char *end) { diff --git a/src/iterator.h b/src/iterator.h index ac17d2970..3f5c82870 100644 --- a/src/iterator.h +++ b/src/iterator.h @@ -57,7 +57,6 @@ typedef struct { int (*current)(const git_index_entry **, git_iterator *); int (*advance)(const git_index_entry **, git_iterator *); int (*advance_into)(const git_index_entry **, git_iterator *); - int (*seek)(git_iterator *, const char *prefix); int (*reset)(git_iterator *, const char *start, const char *end); int (*at_end)(git_iterator *); void (*free)(git_iterator *); @@ -200,13 +199,6 @@ GIT_INLINE(int) git_iterator_advance_into_or_over( return error; } -/* Seek is currently unimplemented */ -GIT_INLINE(int) git_iterator_seek( - git_iterator *iter, const char *prefix) -{ - return iter->cb->seek(iter, prefix); -} - /** * Go back to the start of the iteration. *