===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -c -r1.201 -r1.202
*** src/usr.bin/mandoc/mdoc_validate.c	2015/04/02 22:06:17	1.201
--- src/usr.bin/mandoc/mdoc_validate.c	2015/04/18 16:04:40	1.202
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_validate.c,v 1.201 2015/04/02 22:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_validate.c,v 1.202 2015/04/18 16:04:40 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 38,45 ****
  
  /* FIXME: .Bl -diag can't have non-text children in HEAD. */
  
! #define	PRE_ARGS  struct mdoc *mdoc, struct roff_node *n
! #define	POST_ARGS struct mdoc *mdoc
  
  enum	check_ineq {
  	CHECK_LT,
--- 38,45 ----
  
  /* FIXME: .Bl -diag can't have non-text children in HEAD. */
  
! #define	PRE_ARGS  struct roff_man *mdoc, struct roff_node *n
! #define	POST_ARGS struct roff_man *mdoc
  
  enum	check_ineq {
  	CHECK_LT,
***************
*** 55,64 ****
  	v_post	 post;
  };
  
! static	void	 check_text(struct mdoc *, int, int, char *);
! static	void	 check_argv(struct mdoc *,
  			struct roff_node *, struct mdoc_argv *);
! static	void	 check_args(struct mdoc *, struct roff_node *);
  static	int	 child_an(const struct roff_node *);
  static	enum roff_sec	a2sec(const char *);
  static	size_t		macro2len(int);
--- 55,64 ----
  	v_post	 post;
  };
  
! static	void	 check_text(struct roff_man *, int, int, char *);
! static	void	 check_argv(struct roff_man *,
  			struct roff_node *, struct mdoc_argv *);
! static	void	 check_args(struct roff_man *, struct roff_node *);
  static	int	 child_an(const struct roff_node *);
  static	enum roff_sec	a2sec(const char *);
  static	size_t		macro2len(int);
***************
*** 291,297 ****
  
  
  void
! mdoc_valid_pre(struct mdoc *mdoc, struct roff_node *n)
  {
  	v_pre	 p;
  
--- 291,297 ----
  
  
  void
! mdoc_valid_pre(struct roff_man *mdoc, struct roff_node *n)
  {
  	v_pre	 p;
  
***************
*** 317,323 ****
  }
  
  void
! mdoc_valid_post(struct mdoc *mdoc)
  {
  	struct roff_node *n;
  	v_post p;
--- 317,323 ----
  }
  
  void
! mdoc_valid_post(struct roff_man *mdoc)
  {
  	struct roff_node *n;
  	v_post p;
***************
*** 360,366 ****
  }
  
  static void
! check_args(struct mdoc *mdoc, struct roff_node *n)
  {
  	int		 i;
  
--- 360,366 ----
  }
  
  static void
! check_args(struct roff_man *mdoc, struct roff_node *n)
  {
  	int		 i;
  
***************
*** 373,379 ****
  }
  
  static void
! check_argv(struct mdoc *mdoc, struct roff_node *n, struct mdoc_argv *v)
  {
  	int		 i;
  
--- 373,379 ----
  }
  
  static void
! check_argv(struct roff_man *mdoc, struct roff_node *n, struct mdoc_argv *v)
  {
  	int		 i;
  
***************
*** 382,388 ****
  }
  
  static void
! check_text(struct mdoc *mdoc, int ln, int pos, char *p)
  {
  	char		*cp;
  
--- 382,388 ----
  }
  
  static void
! check_text(struct roff_man *mdoc, int ln, int pos, char *p)
  {
  	char		*cp;
  
***************
*** 1037,1043 ****
  		return;
  
  	nn = mdoc->last;
! 	mdoc->next = MDOC_NEXT_CHILD;
  
  	switch (nn->tok) {
  	case MDOC_Ar:
--- 1037,1043 ----
  		return;
  
  	nn = mdoc->last;
! 	mdoc->next = ROFF_NEXT_CHILD;
  
  	switch (nn->tok) {
  	case MDOC_Ar:
***************
*** 1065,1071 ****
  
  	n = mdoc->last;
  	if (n->child == NULL) {
! 		mdoc->next = MDOC_NEXT_CHILD;
  		mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
  		mdoc->last = n;
  		return;
--- 1065,1071 ----
  
  	n = mdoc->last;
  	if (n->child == NULL) {
! 		mdoc->next = ROFF_NEXT_CHILD;
  		mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
  		mdoc->last = n;
  		return;
***************
*** 1493,1499 ****
  }
  
  static void
! post_sm(struct mdoc *mdoc)
  {
  	struct roff_node	*nch;
  
--- 1493,1499 ----
  }
  
  static void
! post_sm(struct roff_man *mdoc)
  {
  	struct roff_node	*nch;
  
***************
*** 2304,2310 ****
  		return;
  	}
  
! 	mdoc->next = MDOC_NEXT_CHILD;
  	mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
  	mdoc->last = n;
  }
--- 2304,2310 ----
  		return;
  	}
  
! 	mdoc->next = ROFF_NEXT_CHILD;
  	mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
  	mdoc->last = n;
  }