Moving pattern lifetime tracking off of files and onto its own list of

allocated pats.

1 files changed, 3 insertions, 5 deletions

diff --git a/pattern.h b/pattern.h
index 1407cd1..2f63d98 100644
--- a/pattern.h
+++ b/pattern.h
@@ -108,15 +108,13 @@ typedef struct {
 } maybe_pat_t;
 
 __attribute__((nonnull, returns_nonnull))
-pat_t *bp_raw_literal(file_t *f, const char *str, size_t len);
+pat_t *bp_raw_literal(const char *str, size_t len);
 __attribute__((nonnull))
 maybe_pat_t bp_stringpattern(file_t *f, const char *str);
 __attribute__((nonnull(1,2)))
 maybe_pat_t bp_replacement(file_t *f, pat_t *replacepat, const char *replacement);
-__attribute__((nonnull(1)))
-pat_t *chain_together(file_t *f, pat_t *first, pat_t *second);
-__attribute__((nonnull(1)))
-pat_t *either_pat(file_t *f, pat_t *first, pat_t *second);
+pat_t *chain_together(pat_t *first, pat_t *second);
+pat_t *either_pat(pat_t *first, pat_t *second);
 __attribute__((nonnull))
 maybe_pat_t bp_pattern(file_t *f, const char *str);