diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-06-18 20:46:19 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-06-18 20:46:19 +0000 |
| commit | 02772d7cbebdade86dabcbbc9d19e72db2bd0b43 (patch) | |
| tree | cd69db8c6dcccdbdc0b519f7d88aaacc22dbac4d /mdoc_validate.c | |
| parent | e2d8679f361643c8410c69f218268085075bc428 (diff) | |
| download | mandoc-02772d7cbebdade86dabcbbc9d19e72db2bd0b43.tar.gz | |
Added nchild decrement in libman (not used, but better in than forgotten).
Added nchild to libmdoc, deprecated count() functions in validator.
Diffstat (limited to 'mdoc_validate.c')
| -rw-r--r-- | mdoc_validate.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/mdoc_validate.c b/mdoc_validate.c index ab350fa0..3aa69cb2 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -99,7 +99,6 @@ static int err_child_gt(struct mdoc *, const char *, int); static int warn_child_gt(struct mdoc *, const char *, int); static int err_child_eq(struct mdoc *, const char *, int); static int warn_child_eq(struct mdoc *, const char *, int); -static int count_child(struct mdoc *); static int warn_print(struct mdoc *, int, int); static int warn_count(struct mdoc *, const char *, int, const char *, int); @@ -553,19 +552,6 @@ err_count(struct mdoc *m, const char *k, } -static inline int -count_child(struct mdoc *mdoc) -{ - int i; - struct mdoc_node *n; - - for (i = 0, n = mdoc->last->child; n; n = n->next, i++) - /* Do nothing */ ; - - return(i); -} - - /* * Build these up with macros because they're basically the same check * for different inequalities. Yes, this could be done with functions, @@ -576,10 +562,9 @@ count_child(struct mdoc *mdoc) static int \ lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz) \ { \ - int i; \ - if ((i = count_child(mdoc)) ineq sz) \ + if (mdoc->last->nchild ineq sz) \ return(1); \ - return(lvl##_count(mdoc, #ineq, sz, p, i)); \ + return(lvl##_count(mdoc, #ineq, sz, p, mdoc->last->nchild)); \ } #define CHECK_BODY_DEFN(name, lvl, func, num) \ |