Get rid of two empty wrapper functions. No functional change.

diff --git a/usr.bin/mandoc/libman.h b/usr.bin/mandoc/libman.h
index dc56679..1cd48ca 100644 (file)
--- a/usr.bin/mandoc/libman.h
+++ b/usr.bin/mandoc/libman.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: libman.h,v 1.51 2015/04/19 14:57:16 schwarze Exp $ */
+/*     $OpenBSD: libman.h,v 1.52 2015/04/23 15:35:39 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -37,7 +37,6 @@ extern        const struct man_macro *const man_macros;
 __BEGIN_DECLS
 
 int              man_hash_find(const char *);
-void             man_macroend(struct roff_man *);
 void             man_valid_post(struct roff_man *);
 void             man_unscope(struct roff_man *, const struct roff_node *);
 

diff --git a/usr.bin/mandoc/libmdoc.h b/usr.bin/mandoc/libmdoc.h
index 71d6de9..0b6d41e 100644 (file)
--- a/usr.bin/mandoc/libmdoc.h
+++ b/usr.bin/mandoc/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: libmdoc.h,v 1.75 2015/04/19 14:25:05 schwarze Exp $ */
+/*     $OpenBSD: libmdoc.h,v 1.76 2015/04/23 15:35:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -83,7 +83,6 @@ void            mdoc_argv(struct roff_man *, int, int,
                        struct mdoc_arg **, int *, char *);
 enum margserr    mdoc_args(struct roff_man *, int,
                        int *, char *, int, char **);
-void             mdoc_macroend(struct roff_man *);
 enum mdelim      mdoc_isdelim(const char *);
 
 __END_DECLS

diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c
index 91ef0a1..3d20cd9 100644 (file)
--- a/usr.bin/mandoc/man.c
+++ b/usr.bin/mandoc/man.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: man.c,v 1.109 2015/04/19 14:57:16 schwarze Exp $ */
+/*     $OpenBSD: man.c,v 1.110 2015/04/23 15:35:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -53,13 +53,6 @@ static       int              man_ptext(struct roff_man *, int, char *, int);
 static int              man_pmacro(struct roff_man *, int, char *, int);
 
 
-void
-man_endparse(struct roff_man *man)
-{
-
-       man_macroend(man);
-}
-
 int
 man_parseln(struct roff_man *man, int ln, char *buf, int offs)
 {

diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index 7a9e760..9ae9912 100644 (file)
--- a/usr.bin/mandoc/man_macro.c
+++ b/usr.bin/mandoc/man_macro.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: man_macro.c,v 1.70 2015/04/19 14:57:16 schwarze Exp $ */
+/*     $OpenBSD: man_macro.c,v 1.71 2015/04/23 15:35:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -402,9 +402,8 @@ in_line_eoln(MACRO_PROT_ARGS)
                man_valid_post(man);
 }
 
-
 void
-man_macroend(struct roff_man *man)
+man_endparse(struct roff_man *man)
 {
 
        man_unscope(man, man->first);

diff --git a/usr.bin/mandoc/mdoc.c b/usr.bin/mandoc/mdoc.c
index dc61bc9..6dc9d7d 100644 (file)
--- a/usr.bin/mandoc/mdoc.c
+++ b/usr.bin/mandoc/mdoc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc.c,v 1.139 2015/04/19 14:57:16 schwarze Exp $ */
+/*     $OpenBSD: mdoc.c,v 1.140 2015/04/23 15:35:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -87,13 +87,6 @@ static       int               mdoc_ptext(struct roff_man *, int, char *, int);
 static int               mdoc_pmacro(struct roff_man *, int, char *, int);
 
 
-void
-mdoc_endparse(struct roff_man *mdoc)
-{
-
-       mdoc_macroend(mdoc);
-}
-
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).

diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c
index 239bfea..bfebe2c 100644 (file)
--- a/usr.bin/mandoc/mdoc_macro.c
+++ b/usr.bin/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc_macro.c,v 1.150 2015/04/21 16:13:54 schwarze Exp $ */
+/*     $OpenBSD: mdoc_macro.c,v 1.151 2015/04/23 15:35:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -208,7 +208,7 @@ const       struct mdoc_macro * const mdoc_macros = __mdoc_macros;
  * are errors.
  */
 void
-mdoc_macroend(struct roff_man *mdoc)
+mdoc_endparse(struct roff_man *mdoc)
 {
        struct roff_node *n;