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

diff --git a/libman.h b/libman.h
index 6dd453ed1dbbab509e385b775303809be96a58f5..e3f0d9db5c920cd36303332042e024ddae06df9d 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.76 2015/04/19 14:57:38 schwarze Exp $ */
+/*     $Id: libman.h,v 1.77 2015/04/23 15:35:59 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * 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 *);
 __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 *);
 
 void             man_valid_post(struct roff_man *);
 void             man_unscope(struct roff_man *, const struct roff_node *);
 

diff --git a/libmdoc.h b/libmdoc.h
index 3f9e3365d2a5ed3b4b5fe0281da16e18b0aa22f5..1ffaf5e23540e5ee3c5fe931eb9333ae1501b577 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.104 2015/04/19 14:25:41 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.105 2015/04/23 15:35:59 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -84,7 +84,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 **);
                        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
 enum mdelim      mdoc_isdelim(const char *);
 
 __END_DECLS

diff --git a/man.c b/man.c
index e65e8c8cade240afc7ee552b28aa3a7a4ef65585..7046d57d99922dd9dd835bb423f0f7ce1702c180 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.161 2015/04/19 14:57:38 schwarze Exp $ */
+/*     $Id: man.c,v 1.162 2015/04/23 15:35:59 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -55,13 +55,6 @@ static       int              man_ptext(struct roff_man *, int, char *, int);
 static int              man_pmacro(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)
 {
 int
 man_parseln(struct roff_man *man, int ln, char *buf, int offs)
 {

diff --git a/man_macro.c b/man_macro.c
index 96d99f67b3afe722a9b3f8e6c089dec8b5f54ac1..afb377c04782c3f8d772fbac946698c17f40474f 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.108 2015/04/19 14:57:38 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.109 2015/04/23 15:35:59 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -404,9 +404,8 @@ in_line_eoln(MACRO_PROT_ARGS)
                man_valid_post(man);
 }
 
                man_valid_post(man);
 }
 

-

 void
 void

-man_macroend(struct roff_man *man)
+man_endparse(struct roff_man *man)

 {
 
        man_unscope(man, man->first);
 {
 
        man_unscope(man, man->first);

diff --git a/mdoc.c b/mdoc.c
index dc74a104172f346828d4f719e13d552e60b9f2fe..7fad2cff24a37564e669d2314406f36ecb4ad2a8 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.250 2015/04/19 14:57:38 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.251 2015/04/23 15:35:59 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -89,13 +89,6 @@ static       int               mdoc_ptext(struct roff_man *, int, char *, int);
 static int               mdoc_pmacro(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()).
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 8a81165238c844da5dd06972f7f64bde86244c88..3e5667de5aa325b1b82c5fc1cd4ff75200668a9b 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.194 2015/04/21 16:14:25 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.195 2015/04/23 15:35:59 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -210,7 +210,7 @@ const       struct mdoc_macro * const mdoc_macros = __mdoc_macros;
  * are errors.
  */
 void
  * are errors.
  */
 void

-mdoc_macroend(struct roff_man *mdoc)
+mdoc_endparse(struct roff_man *mdoc)

 {
        struct roff_node *n;
 
 {
        struct roff_node *n;