diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-08-21 12:12:12 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-08-21 12:12:12 +0000 |
| commit | d8d8e19a17345326342a05e737487b04fa994353 (patch) | |
| tree | 761cd03a2f8a171fc09d2d039c72505cafb59db8 /man_validate.c | |
| parent | 2a2e4af01790aa6afe854a5284be8b7ff895e9b5 (diff) | |
| download | mandoc-d8d8e19a17345326342a05e737487b04fa994353.tar.gz | |
Open explicit scope on libman exit now only generates warning.
Consecutive ELINE scopes are now pruned (with a warning).
Diffstat (limited to 'man_validate.c')
| -rw-r--r-- | man_validate.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/man_validate.c b/man_validate.c index 668d5c87..a2507a85 100644 --- a/man_validate.c +++ b/man_validate.c @@ -36,7 +36,6 @@ struct man_valid { }; static int check_bline(CHKARGS); -static int check_eline(CHKARGS); static int check_eq0(CHKARGS); static int check_eq1(CHKARGS); static int check_ge2(CHKARGS); @@ -52,7 +51,6 @@ static v_check posts_ge2_le5[] = { check_ge2, check_le5, NULL }; static v_check posts_par[] = { check_par, NULL }; static v_check posts_sec[] = { check_sec, NULL }; static v_check posts_sp[] = { check_sp, NULL }; -static v_check pres_eline[] = { check_eline, NULL }; static v_check pres_bline[] = { check_bline, NULL }; static const struct man_valid man_valids[MAN_MAX] = { @@ -66,15 +64,15 @@ static const struct man_valid man_valids[MAN_MAX] = { { pres_bline, posts_par }, /* P */ { pres_bline, posts_par }, /* IP */ { pres_bline, posts_par }, /* HP */ - { pres_eline, NULL }, /* SM */ - { pres_eline, NULL }, /* SB */ + { NULL, NULL }, /* SM */ + { NULL, NULL }, /* SB */ { NULL, NULL }, /* BI */ { NULL, NULL }, /* IB */ { NULL, NULL }, /* BR */ { NULL, NULL }, /* RB */ - { pres_eline, NULL }, /* R */ - { pres_eline, NULL }, /* B */ - { pres_eline, NULL }, /* I */ + { NULL, NULL }, /* R */ + { NULL, NULL }, /* B */ + { NULL, NULL }, /* I */ { NULL, NULL }, /* IR */ { NULL, NULL }, /* RI */ { pres_bline, posts_eq0 }, /* na */ @@ -140,12 +138,13 @@ static int check_root(CHKARGS) { - /* XXX - make this into a warning? */ if (MAN_BLINE & m->flags) - return(man_nerr(m, n, WEXITSCOPE)); - /* XXX - make this into a warning? */ + return(man_nwarn(m, n, WEXITSCOPE)); if (MAN_ELINE & m->flags) - return(man_nerr(m, n, WEXITSCOPE)); + return(man_nwarn(m, n, WEXITSCOPE)); + + m->flags &= ~MAN_BLINE; + m->flags &= ~MAN_ELINE; if (NULL == m->first->child) return(man_nerr(m, n, WNODATA)); @@ -289,23 +288,12 @@ check_par(CHKARGS) static int -check_eline(CHKARGS) -{ - - if (MAN_ELINE & m->flags) - return(man_nerr(m, n, WLNSCOPE)); - return(1); -} - - -static int check_bline(CHKARGS) { + assert( ! (MAN_ELINE & m->flags)); if (MAN_BLINE & m->flags) return(man_nerr(m, n, WLNSCOPE)); - if (MAN_ELINE & m->flags) - return(man_nerr(m, n, WLNSCOPE)); return(1); } |