Moving cache logic into match, cleaner next_match() API, and slightly

less tightly coupled UTF8 API

1 files changed, 3 insertions, 2 deletions

diff --git a/match.h b/match.h
index cdd6592..535e20e 100644
--- a/match.h
+++ b/match.h
@@ -12,12 +12,13 @@
 
 __attribute__((returns_nonnull))
 match_t *new_match(def_t *defs, pat_t *pat, const char *start, const char *end, match_t *children[]);
-__attribute__((nonnull(2,4)))
-match_t *next_match(def_t *defs, file_t *f, match_t *prev, pat_t *pat, pat_t *skip, bool ignorecase);
 __attribute__((nonnull))
 void recycle_if_unused(match_t **at_m);
 size_t free_all_matches(void);
 size_t recycle_all_matches(void);
 
+bool next_match(match_t **m, def_t *defs, file_t *f, pat_t *pat, pat_t *skip, bool ignorecase);
+#define stop_matching(m) next_match(m, NULL, NULL, NULL, NULL, 0)
+
 #endif
 // vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1,\:0