Third step towards parser unification:

Replace struct mdoc_meta and struct man_meta by a unified struct roff_meta.
Written of the train from London to Exeter on the way to p2k15.

1 files changed, 2 insertions, 11 deletions

diff --git a/usr.bin/mandoc/man.h b/usr.bin/mandoc/man.h
index af4c3d1b274..50d05d1a31d 100644
--- a/usr.bin/mandoc/man.h
+++ b/usr.bin/mandoc/man.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man.h,v 1.51 2015/04/02 22:06:17 schwarze Exp $ */
+/*	$OpenBSD: man.h,v 1.52 2015/04/02 23:47:43 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -56,15 +56,6 @@
 #define	MAN_ll  37
 #define	MAN_MAX 38
 
-struct	man_meta {
-	char		*msec; /* `TH' section (1, 3p, etc.) */
-	char		*date; /* `TH' normalised date */
-	char		*vol; /* `TH' volume */
-	char		*title; /* `TH' title (e.g., FOO) */
-	char		*source; /* `TH' source (e.g., GNU) */
-	int		 hasbody; /* document is not empty */
-};
-
 /* Names of macros. */
 extern	const char *const *man_macronames;
 
@@ -73,7 +64,7 @@ __BEGIN_DECLS
 struct	man;
 
 const struct roff_node *man_node(const struct man *);
-const struct man_meta *man_meta(const struct man *);
+const struct roff_meta *man_meta(const struct man *);
 const struct mparse   *man_mparse(const struct man *);
 void man_deroff(char **, const struct roff_node *);