[BACK]Return to man_validate.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/man_validate.c between version 1.2 and 1.10

version 1.2, 2009/03/25 21:46:24 version 1.10, 2009/06/16 19:55:28
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the   * purpose with or without fee is hereby granted, provided that the above
  * above copyright notice and this permission notice appear in all   * copyright notice and this permission notice appear in all copies.
  * copies.  
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.  
  */   */
 #include <sys/types.h>  #include <sys/types.h>
   
Line 35  struct man_valid {
Line 33  struct man_valid {
         v_post   *posts;          v_post   *posts;
 };  };
   
 static  int       count(POSTARGS);  static  int       count(const struct man_node *);
 static  int       check_eq0(POSTARGS);  static  int       check_eq0(POSTARGS);
 static  int       check_ge1(POSTARGS);  static  int       check_ge1(POSTARGS);
 static  int       check_ge2(POSTARGS);  static  int       check_ge2(POSTARGS);
Line 50  static v_post   posts_eq0[] = { check_eq0, NULL };
Line 48  static v_post   posts_eq0[] = { check_eq0, NULL };
 static  v_post    posts_ge2_le5[] = { check_ge2, check_le5, NULL };  static  v_post    posts_ge2_le5[] = { check_ge2, check_le5, NULL };
   
 static  const struct man_valid man_valids[MAN_MAX] = {  static  const struct man_valid man_valids[MAN_MAX] = {
         { NULL }, /* __ */          { posts_eq0 }, /* br */
         { posts_ge2_le5 }, /* TH */          { posts_ge2_le5 }, /* TH */
         { posts_ge1 }, /* SH */          { posts_ge1 }, /* SH */
         { posts_ge1 }, /* SS */          { posts_ge1 }, /* SS */
         { posts_le1 }, /* TP */          { NULL }, /* TP */
         { posts_eq0 }, /* LP */          { posts_eq0 }, /* LP */
         { posts_eq0 }, /* PP */          { posts_eq0 }, /* PP */
         { posts_eq0 }, /* P */          { posts_eq0 }, /* P */
Line 70  static const struct man_valid man_valids[MAN_MAX] = {
Line 68  static const struct man_valid man_valids[MAN_MAX] = {
         { NULL }, /* B */          { NULL }, /* B */
         { NULL }, /* I */          { NULL }, /* I */
         { NULL }, /* IR */          { NULL }, /* IR */
           { NULL }, /* RI */
           { posts_eq0 }, /* na */
           { NULL }, /* i */
 };  };
   
   
Line 102  man_valid_post(struct man *m)
Line 103  man_valid_post(struct man *m)
   
   
 static inline int  static inline int
 count(POSTARGS)  count(const struct man_node *n)
 {  {
         int              i;          int              i;
   
Line 117  static int \
Line 118  static int \
 check_##name(POSTARGS) \  check_##name(POSTARGS) \
 { \  { \
         int              c; \          int              c; \
         if ((c = count(m, n->child)) ineq (x)) \          if ((c = count(n->child)) ineq (x)) \
                 return(1); \                  return(1); \
         return(man_vwarn(m, n->line, n->pos, \          return(man_verr(m, n->line, n->pos, \
                         "expected line arguments %s %d, have %d", \                          "expected line arguments %s %d, have %d", \
                         #ineq, (x), c)); \                          #ineq, (x), c)); \
 }  }

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.10

CVSweb