Commit 35877463fd5d91a75e97a0857ce6df669606e7c7
2016-03-21T17:03:00
iterator: refactor empty iterator to new style
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
diff --git a/src/iterator.c b/src/iterator.c
index cf3e29b..3775144 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -572,33 +572,44 @@ static iterator_pathlist_search_t iterator_pathlist_search(
/* Empty iterator */
-static int empty_iterator__noop(const git_index_entry **e, git_iterator *i)
+static int empty_iterator_noop(const git_index_entry **e, git_iterator *i)
{
GIT_UNUSED(i);
iterator__clear_entry(e);
return GIT_ITEROVER;
}
-static int empty_iterator__reset(git_iterator *i)
+static int empty_iterator_advance_over(
+ const git_index_entry **e,
+ git_iterator_status_t *s,
+ git_iterator *i)
+{
+ GIT_UNUSED(i);
+ *s = GIT_ITERATOR_STATUS_EMPTY;
+ iterator__clear_entry(e);
+ return GIT_ITEROVER;
+}
+
+static int empty_iterator_reset(git_iterator *i)
{
GIT_UNUSED(i);
return 0;
}
-static int empty_iterator__reset_range(
+static int empty_iterator_reset_range(
git_iterator *i, const char *s, const char *e)
{
GIT_UNUSED(i); GIT_UNUSED(s); GIT_UNUSED(e);
return 0;
}
-static int empty_iterator__at_end(git_iterator *i)
+static int empty_iterator_at_end(git_iterator *i)
{
GIT_UNUSED(i);
return 1;
}
-static void empty_iterator__free(git_iterator *i)
+static void empty_iterator_free(git_iterator *i)
{
GIT_UNUSED(i);
}
@@ -609,22 +620,32 @@ typedef struct {
} empty_iterator;
int git_iterator_for_nothing(
- git_iterator **iter,
+ git_iterator **out,
git_iterator_options *options)
{
- empty_iterator *i = git__calloc(1, sizeof(empty_iterator));
- GITERR_CHECK_ALLOC(i);
+ empty_iterator *iter;
-#define empty_iterator__current empty_iterator__noop
-#define empty_iterator__advance empty_iterator__noop
-#define empty_iterator__advance_into empty_iterator__noop
+ static git_iterator_callbacks callbacks = {
+ empty_iterator_noop,
+ empty_iterator_noop,
+ empty_iterator_noop,
+ empty_iterator_advance_over,
+ empty_iterator_reset,
+ empty_iterator_reset_range,
+ empty_iterator_at_end,
+ empty_iterator_free
+ };
- ITERATOR_BASE_INIT(i, empty, EMPTY, NULL);
+ *out = NULL;
- if (options && (options->flags & GIT_ITERATOR_IGNORE_CASE) != 0)
- i->base.flags |= GIT_ITERATOR_IGNORE_CASE;
+ iter = git__calloc(1, sizeof(empty_iterator));
+ GITERR_CHECK_ALLOC(iter);
- *iter = (git_iterator *)i;
+ iter->base.type = GIT_ITERATOR_TYPE_EMPTY;
+ iter->base.cb = &callbacks;
+ iter->base.flags = options->flags;
+
+ *out = &iter->base;
return 0;
}