Commit Diff

Commit:
820e3e9acf1dfd66b46466cbe5545b7f3aa22a94
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
parser: make parser_foreach_line private while here also inline fn: it's always p->parseline.
Actions:
Patch | Tree
commit - 9ce0974dc12554976702bca750fe2501ff9e5ccb
commit + 820e3e9acf1dfd66b46466cbe5545b7f3aa22a94
blob - c72f9c017b8a07f9bd7ddf1abce07af8791ab481
blob + e1168776b481988b2b0c066f6cdbc6ce837932ff
--- parser.c
+++ parser.c
@@ -23,6 +23,8 @@
 #include "parser.h"
 #include "telescope.h"
 
+static int parser_foreach_line(struct parser *, const char *, size_t);
+
 void
 parser_init(struct tab *tab, parserfn fn)
 {
@@ -38,7 +40,7 @@ parser_parse(struct tab *tab, const char *chunk, size_
 
 	if (p->parse)
 		return p->parse(p, chunk, len);
-	return parser_foreach_line(p, chunk, len, p->parseline);
+	return parser_foreach_line(p, chunk, len);
 }
 
 int
@@ -73,8 +75,7 @@ parser_free(struct tab *tab)
 		if (p->parse)
 			r = p->parse(p, p->buf, p->len);
 		else
-			r = parser_foreach_line(p, p->buf, p->len,
-			    p->parseline);
+			r = parser_foreach_line(p, p->buf, p->len);
 	}
 
 	free(p->buf);
@@ -165,9 +166,8 @@ parser_set_buf(struct parser *p, const char *buf, size
 	return 1;
 }
 
-int
-parser_foreach_line(struct parser *p, const char *buf, size_t size,
-    parsechunkfn fn)
+static int
+parser_foreach_line(struct parser *p, const char *buf, size_t size)
 {
 	char		*b, *e;
 	unsigned int	 ch;
@@ -212,7 +212,7 @@ parser_foreach_line(struct parser *p, const char *buf,
 			break;
 		l = e - b;
 
-		if (!fn(p, b, l))
+		if (!p->parseline(p, b, l))
 			return 0;
 
 		len -= l;
blob - 7dcf584964c0faeedfd4bcc0337a56535601d897
blob + 9ee54b926e3370f157ddf1558fcbb2a2466cf902
--- parser.h
+++ parser.h
@@ -29,7 +29,6 @@ int	 parser_serialize(struct tab *, FILE *);
 
 int	 parser_append(struct parser*, const char*, size_t);
 int	 parser_set_buf(struct parser*, const char*, size_t);
-int	 parser_foreach_line(struct parser*, const char*, size_t, parsechunkfn);
 
 /* parser_gemtext.c */
 void	 gemtext_initparser(struct parser*);