===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -c -r1.142 -r1.143
*** src/usr.bin/mandoc/mandocdb.c	2015/04/02 22:06:17	1.142
--- src/usr.bin/mandoc/mandocdb.c	2015/04/02 23:47:43	1.143
***************
*** 1,4 ****
! /*	$OpenBSD: mandocdb.c,v 1.142 2015/04/02 22:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mandocdb.c,v 1.143 2015/04/02 23:47:43 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 120,126 ****
  	STMT__MAX
  };
  
! typedef	int (*mdoc_fp)(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
  
  struct	mdoc_handler {
--- 120,126 ----
  	STMT__MAX
  };
  
! typedef	int (*mdoc_fp)(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
  
  struct	mdoc_handler {
***************
*** 146,173 ****
  static	void	 mpages_merge(struct mparse *);
  static	void	 names_check(void);
  static	void	 parse_cat(struct mpage *, int);
! static	void	 parse_man(struct mpage *, const struct man_meta *,
  			const struct roff_node *);
! static	void	 parse_mdoc(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_body(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_head(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Fd(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
  static	void	 parse_mdoc_fname(struct mpage *, const struct roff_node *);
! static	int	 parse_mdoc_Fn(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Fo(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Nd(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Nm(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Sh(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Xr(struct mpage *, const struct mdoc_meta *,
  			const struct roff_node *);
  static	void	 putkey(const struct mpage *, char *, uint64_t);
  static	void	 putkeys(const struct mpage *, char *, size_t, uint64_t);
--- 146,173 ----
  static	void	 mpages_merge(struct mparse *);
  static	void	 names_check(void);
  static	void	 parse_cat(struct mpage *, int);
! static	void	 parse_man(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	void	 parse_mdoc(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_body(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_head(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Fd(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
  static	void	 parse_mdoc_fname(struct mpage *, const struct roff_node *);
! static	int	 parse_mdoc_Fn(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Fo(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Nd(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Nm(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Sh(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
! static	int	 parse_mdoc_Xr(struct mpage *, const struct roff_meta *,
  			const struct roff_node *);
  static	void	 putkey(const struct mpage *, char *, uint64_t);
  static	void	 putkeys(const struct mpage *, char *, size_t, uint64_t);
***************
*** 1425,1431 ****
  }
  
  static void
! parse_man(struct mpage *mpage, const struct man_meta *meta,
  	const struct roff_node *n)
  {
  	const struct roff_node *head, *body;
--- 1425,1431 ----
  }
  
  static void
! parse_man(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  	const struct roff_node *head, *body;
***************
*** 1551,1557 ****
  }
  
  static void
! parse_mdoc(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1551,1557 ----
  }
  
  static void
! parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  
***************
*** 1584,1590 ****
  }
  
  static int
! parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  	char		*start, *end;
--- 1584,1590 ----
  }
  
  static int
! parse_mdoc_Fd(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  	char		*start, *end;
***************
*** 1649,1655 ****
  }
  
  static int
! parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1649,1655 ----
  }
  
  static int
! parse_mdoc_Fn(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  
***************
*** 1666,1672 ****
  }
  
  static int
! parse_mdoc_Fo(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1666,1672 ----
  }
  
  static int
! parse_mdoc_Fo(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  
***************
*** 1680,1686 ****
  }
  
  static int
! parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  	char	*cp;
--- 1680,1686 ----
  }
  
  static int
! parse_mdoc_Xr(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  	char	*cp;
***************
*** 1700,1706 ****
  }
  
  static int
! parse_mdoc_Nd(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1700,1706 ----
  }
  
  static int
! parse_mdoc_Nd(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  
***************
*** 1710,1716 ****
  }
  
  static int
! parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1710,1716 ----
  }
  
  static int
! parse_mdoc_Nm(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  
***************
*** 1732,1738 ****
  }
  
  static int
! parse_mdoc_Sh(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1732,1738 ----
  }
  
  static int
! parse_mdoc_Sh(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  
***************
*** 1740,1746 ****
  }
  
  static int
! parse_mdoc_head(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1740,1746 ----
  }
  
  static int
! parse_mdoc_head(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {
  
***************
*** 1748,1754 ****
  }
  
  static int
! parse_mdoc_body(struct mpage *mpage, const struct mdoc_meta *meta,
  	const struct roff_node *n)
  {
  
--- 1748,1754 ----
  }
  
  static int
! parse_mdoc_body(struct mpage *mpage, const struct roff_meta *meta,
  	const struct roff_node *n)
  {