The files mandoc.c and mandoc.h contained both specialised low-level

functions used for multiple languages (mdoc, man, roff), for example
mandoc_escape(), mandoc_getarg(), mandoc_eos(), and generic auxiliary
functions.  Split the auxiliaries out into their own file and header.
While here, do some #include cleanup.

diff --git a/Makefile b/Makefile
index e29946e67ba11d0605f01f5c15ec89256abce444..6338839bd085d5ab6f718ff4ed9f4a9e0c6af379 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,8 @@ SRCS                 = Makefile \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \
+                  mandoc_aux.c \
+                  mandoc_aux.h \
                   mandoc_char.7 \
                   mandocdb.8 \
                   mandocdb.c \
@@ -201,6 +203,7 @@ LIBMANDOC_OBJS       = $(LIBMAN_OBJS) \
                   $(LIBROFF_OBJS) \
                   chars.o \
                   mandoc.o \
+                  mandoc_aux.o \
                   msec.o \
                   read.o
 
@@ -225,7 +228,7 @@ vol.o: vol.in
 $(LIBMAN_OBJS): libman.h
 $(LIBMDOC_OBJS): libmdoc.h
 $(LIBROFF_OBJS): libroff.h
-$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h
 $(COMPAT_OBJS): config.h compat_ohash.h
 
 MANDOC_HTML_OBJS = eqn_html.o \
@@ -252,10 +255,11 @@ MANDOC_OBJS        = $(MANDOC_HTML_OBJS) \
                   main.o \
                   out.o \
                   tree.o
-$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
+$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h
 
 MANDOCDB_OBJS   = mandocdb.o mansearch_const.o manpath.o
-$(MANDOCDB_OBJS): mansearch.h mandoc.h mdoc.h man.h config.h manpath.h
+$(MANDOCDB_OBJS): mansearch.h mandoc.h mandoc_aux.h \
+                 mdoc.h man.h config.h manpath.h
 
 PRECONV_OBJS    = preconv.o
 $(PRECONV_OBJS): config.h

diff --git a/arch.c b/arch.c
index e764bfe9931fd3f7e1cc0aea9155ccac080b7aa6..8a8b038e92368879a652344fdbefee5684abb8ed 100644 (file)
--- a/arch.c
+++ b/arch.c
@@ -1,4 +1,4 @@
-/*     $Id: arch.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */
+/*     $Id: arch.c,v 1.10 2014/03/23 11:25:25 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,12 +18,9 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "mdoc.h"
-#include "mandoc.h"
 #include "libmdoc.h"
 
 #define LINE(x, y) \

diff --git a/att.c b/att.c
index 24d757ddf75b69b67bff720e32295f6f1bdba6ee..3790ab9e1f291059962f41592a25a554f3ebb2fd 100644 (file)
--- a/att.c
+++ b/att.c
@@ -1,4 +1,4 @@
-/*     $Id: att.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */
+/*     $Id: att.c,v 1.10 2014/03/23 11:25:25 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,12 +18,9 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "mdoc.h"
-#include "mandoc.h"
 #include "libmdoc.h"
 
 #define LINE(x, y) \

diff --git a/chars.c b/chars.c
index 35046202303650b91e74f59602a01a87c1a6a4e2..d59becfaf77bb437ec01939857bcd79d1bcb3fe8 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*     $Id: chars.c,v 1.55 2014/01/22 20:58:39 schwarze Exp $ */
+/*     $Id: chars.c,v 1.56 2014/03/23 11:25:25 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 
 #define        PRINT_HI         126

diff --git a/eqn.c b/eqn.c
index 37f01bcb5b6e67c6c7fb90c7bc8b411f7c86cc98..2a46ec6d4b75ae80075e758b16361e010f904bdb 100644 (file)
--- a/eqn.c
+++ b/eqn.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn.c,v 1.38 2011/07/25 15:37:00 kristaps Exp $ */
+/*     $Id: eqn.c,v 1.39 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 

diff --git a/html.c b/html.c
index bbc9ec5b39f5fc42bf9953855b422e7f4a831750..32c31e50474763dc00e00e9c6692a4ba6a3600ad 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.154 2014/01/22 20:58:39 schwarze Exp $ */
+/*     $Id: html.c,v 1.155 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,6 +31,7 @@
 #include <unistd.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "out.h"
 #include "html.h"

diff --git a/lib.c b/lib.c
index 7a18a5dd4fe69990d84a67050cc13b3ef40cad29..8cc8a778a690403e0b09caae50b337b1204e1d35 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -1,4 +1,4 @@
-/*     $Id: lib.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */
+/*     $Id: lib.c,v 1.10 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,12 +18,9 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "mdoc.h"
-#include "mandoc.h"
 #include "libmdoc.h"
 
 #define LINE(x, y) \

diff --git a/main.c b/main.c
index 85ad99ef081e83504665367b4d815e4b2cedfbbe..4fb29d0eef7441a5b3e69fd92be8861ba885d341 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.171 2014/03/19 22:20:43 schwarze Exp $ */
+/*     $Id: main.c,v 1.172 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "main.h"
 #include "mdoc.h"
 #include "man.h"

diff --git a/man.c b/man.c
index 9e4ded354c45e31d992507046f6f0d3ddd04adc9..113c72dac8fb559fe9a106fb52eb83a08812e17d 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.124 2014/01/06 00:53:33 schwarze Exp $ */
+/*     $Id: man.c,v 1.125 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,6 +30,7 @@
 
 #include "man.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libman.h"
 #include "libmandoc.h"
 

diff --git a/man_hash.c b/man_hash.c
index 86c5c40a199b8c62d8e166ccac3669fde1e42ed6..9961377ce46e03bd40307175554ccd0a931ce6b3 100644 (file)
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,4 +1,4 @@
-/*     $Id: man_hash.c,v 1.25 2011/07/24 18:15:14 kristaps Exp $ */
+/*     $Id: man_hash.c,v 1.26 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -23,7 +23,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "man.h"

diff --git a/man_validate.c b/man_validate.c
index ded50ba4f65c571ee70f9d4018dfb0c8c817886e..647dbcca3ba075dba04180c17d0edfc31fd9ac71 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.88 2014/01/06 22:39:25 schwarze Exp $ */
+/*     $Id: man_validate.c,v 1.89 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,6 +32,7 @@
 
 #include "man.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libman.h"
 #include "libmandoc.h"
 

diff --git a/mandoc.3 b/mandoc.3
index db7637491491057123e9b52905392f1e00dccace..2e6b78b96a3f9eb5e146ee2be6ee4ed1ef31f420 100644 (file)
--- a/mandoc.3
+++ b/mandoc.3
@@ -1,4 +1,4 @@
-.\"    $Id: mandoc.3,v 1.23 2014/01/05 20:26:36 schwarze Exp $
+.\"    $Id: mandoc.3,v 1.24 2014/03/23 11:25:26 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,12 +15,17 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 5 2014 $
+.Dd $Mdocdate: March 23 2014 $
 .Dt MANDOC 3
 .Os
 .Sh NAME
 .Nm mandoc ,
+.Nm mandoc_calloc ,
 .Nm mandoc_escape ,
+.Nm mandoc_malloc ,
+.Nm mandoc_realloc ,
+.Nm mandoc_strdup ,
+.Nm mandoc_strndup ,
 .Nm man_meta ,
 .Nm man_mparse ,
 .Nm man_node ,
@@ -45,28 +50,30 @@
 .Sh LIBRARY
 .Lb libmandoc
 .Sh SYNOPSIS
-.In man.h
-.In mdoc.h
 .In mandoc.h
+.Fd "#define ASCII_NBRSP"
+.Fd "#define ASCII_HYPH"
+.Fd "#define ASCII_BREAK"
+.Ft "void *"
+.Fo mandoc_calloc
+.Fa "size_t nmemb"
+.Fa "size_t size"
+.Fc
 .Ft "enum mandoc_esc"
 .Fo mandoc_escape
 .Fa "const char **end"
 .Fa "const char **start"
 .Fa "int *sz"
 .Fc
-.Ft "const struct man_meta *"
-.Fo man_meta
-.Fa "const struct man *man"
-.Fc
-.Ft "const struct mparse *"
-.Fo man_mparse
-.Fa "const struct man *man"
-.Fc
-.Ft "const struct man_node *"
-.Fo man_node
-.Fa "const struct man *man"
-.Fc
+.Ft "void *"
+.Fn mandoc_malloc "size_t size"
 .Ft "struct mchars *"
+.Fo mandoc_realloc
+.Fa "void *ptr"
+.Fa "size_t size"
+.Fc
+.Ft "char *"
+.Fn mandoc_strdup
 .Fn mchars_alloc "void"
 .Ft void
 .Fn mchars_free "struct mchars *p"
@@ -87,14 +94,6 @@
 .Fa "const char *cp"
 .Fa "size_t sz"
 .Fc
-.Ft "const struct mdoc_meta *"
-.Fo mdoc_meta
-.Fa "const struct mdoc *mdoc"
-.Fc
-.Ft "const struct mdoc_node *"
-.Fo mdoc_node
-.Fa "const struct mdoc *mdoc"
-.Fc
 .Ft void
 .Fo mparse_alloc
 .Fa "enum mparset inttype"
@@ -104,6 +103,15 @@
 .Fa "int quick"
 .Fc
 .Ft void
+.Fo (*mandocmsg)
+.Fa "enum mandocerr errtype"
+.Fa "enum mandoclevel level"
+.Fa "const char *file"
+.Fa "int line"
+.Fa "int col"
+.Fa "const char *msg"
+.Fc
+.Ft void
 .Fo mparse_free
 .Fa "struct mparse *parse"
 .Fc
@@ -139,11 +147,33 @@
 .Fo mparse_strlevel
 .Fa "enum mandoclevel"
 .Fc
-.Vt extern const char * const * man_macronames;
+.In mandoc.h
+.In mdoc.h
+.Ft "const struct mdoc_meta *"
+.Fo mdoc_meta
+.Fa "const struct mdoc *mdoc"
+.Fc
+.Ft "const struct mdoc_node *"
+.Fo mdoc_node
+.Fa "const struct mdoc *mdoc"
+.Fc
 .Vt extern const char * const * mdoc_argnames;
 .Vt extern const char * const * mdoc_macronames;
-.Fd "#define ASCII_NBRSP"
-.Fd "#define ASCII_HYPH"
+.In mandoc.h
+.In man.h
+.Ft "const struct man_meta *"
+.Fo man_meta
+.Fa "const struct man *man"
+.Fc
+.Ft "const struct mparse *"
+.Fo man_mparse
+.Fa "const struct man *man"
+.Fc
+.Ft "const struct man_node *"
+.Fo man_node
+.Fa "const struct man *man"
+.Fc
+.Vt extern const char * const * man_macronames;
 .Sh DESCRIPTION
 The
 .Nm mandoc

diff --git a/mandoc.c b/mandoc.c
index b3928ae46c46a555995b4fd4d60ae54046753a66..2df01659e6bf7b659a0e8bfda4913a8285dce91f 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.75 2013/12/31 23:23:10 schwarze Exp $ */
+/*     $Id: mandoc.c,v 1.76 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,6 +31,7 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 
 #define DATESIZE 32
@@ -353,74 +354,6 @@ mandoc_escape(const char **end, const char **start, int *sz)
        return(gly);
 }
 
-void *
-mandoc_calloc(size_t num, size_t size)
-{
-       void            *ptr;
-
-       ptr = calloc(num, size);
-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(ptr);
-}
-
-
-void *
-mandoc_malloc(size_t size)
-{
-       void            *ptr;
-
-       ptr = malloc(size);
-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(ptr);
-}
-
-
-void *
-mandoc_realloc(void *ptr, size_t size)
-{
-
-       ptr = realloc(ptr, size);
-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(ptr);
-}
-
-char *
-mandoc_strndup(const char *ptr, size_t sz)
-{
-       char            *p;
-
-       p = mandoc_malloc(sz + 1);
-       memcpy(p, ptr, sz);
-       p[(int)sz] = '\0';
-       return(p);
-}
-
-char *
-mandoc_strdup(const char *ptr)
-{
-       char            *p;
-
-       p = strdup(ptr);
-       if (NULL == p) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(p);
-}
-
 /*
  * Parse a quoted or unquoted roff-style request or macro argument.
  * Return a pointer to the parsed argument, which is either the original

diff --git a/mandoc.h b/mandoc.h
index 011f1b06acee917bc707f9ae83fd14cec8558219..a6900ee6006943a69a30d9f75c873da779787c32 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.h,v 1.117 2014/03/19 22:20:43 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.118 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -405,12 +405,7 @@ struct     man;
 
 __BEGIN_DECLS
 
-void            *mandoc_calloc(size_t, size_t);
 enum mandoc_esc          mandoc_escape(const char **, const char **, int *);
-void            *mandoc_malloc(size_t);
-void            *mandoc_realloc(void *, size_t);
-char            *mandoc_strdup(const char *);
-char            *mandoc_strndup(const char *, size_t);
 struct mchars   *mchars_alloc(void);
 void             mchars_free(struct mchars *);
 char             mchars_num2char(const char *, size_t);

diff --git a/mandocdb.c b/mandocdb.c
index 16a1acc469f4fb11a2f099875c3f0d457b92f425..70c66e4071c798818cb0876a83a823d07204566a 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.118 2014/03/19 22:33:09 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.119 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -46,6 +46,7 @@
 #include "mdoc.h"
 #include "man.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "manpath.h"
 #include "mansearch.h"
 

diff --git a/manpath.c b/manpath.c
index c33e0ecf469c3cb501d4293e6b8b084c1f1b9bc2..f301c0d63afefac47bb2cef8170e811d77072b4a 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*     $Id: manpath.c,v 1.12 2013/11/21 01:49:18 schwarze Exp $ */
+/*     $Id: manpath.c,v 1.13 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mandoc.h"
+#include "mandoc_aux.h"
 #include "manpath.h"
 
 #define MAN_CONF_FILE  "/etc/man.conf"

diff --git a/mansearch.c b/mansearch.c
index dd7ab9cd3a22983ff1e58b3c94403ef2cd1791b9..d53cc2a67000c68dc47db0e16b2b33d11bdbcd53 100644 (file)
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/*     $Id: mansearch.c,v 1.22 2014/03/17 16:31:44 schwarze Exp $ */
+/*     $Id: mansearch.c,v 1.23 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -39,6 +39,7 @@
 #include <sqlite3.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "manpath.h"
 #include "mansearch.h"
 

diff --git a/mdoc.c b/mdoc.c
index a586e11c5540d7c011ab07083008e54d8572923d..612f259aba338c623c46bcb2b071a83b670b8204 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.208 2014/01/05 20:26:36 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.209 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,6 +30,7 @@
 
 #include "mdoc.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 

diff --git a/mdoc_argv.c b/mdoc_argv.c
index bb9bc6c339b788980fbe37ae70cffa34c93a1c3e..3bb07f5520be6b8c55fc9a5e3c5f56789d1afc66 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_argv.c,v 1.89 2013/12/25 00:50:05 schwarze Exp $ */
+/*     $Id: mdoc_argv.c,v 1.90 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,6 +28,7 @@
 
 #include "mdoc.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 

diff --git a/mdoc_hash.c b/mdoc_hash.c
index 59a8d26a8817904bee42d7952439764cb146e5e2..1a5dcc4b2d6a386e25e56cd1f4c85ff14bdc2e67 100644 (file)
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_hash.c,v 1.18 2011/07/24 18:15:14 kristaps Exp $ */
+/*     $Id: mdoc_hash.c,v 1.19 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "mdoc.h"
-#include "mandoc.h"
 #include "libmdoc.h"
 
 static unsigned char    table[27 * 12];

diff --git a/mdoc_man.c b/mdoc_man.c
index a6517df5eca08da0760de853274f86c2b096425c..e4db5aedf4eff672b8877452233d2639e553d574 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.58 2014/01/22 20:58:39 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.59 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "man.h"
 #include "mdoc.h"
@@ -461,7 +462,7 @@ print_offs(const char *v)
 /*
  * Set up the indentation for a list item; used from pre_it().
  */
-void
+static void
 print_width(const char *v, const struct mdoc_node *child, size_t defsz)
 {
        char              buf[24];
@@ -513,7 +514,7 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
        TPremain = remain;
 }
 
-void
+static void
 print_count(int *count)
 {
        char              buf[12];

diff --git a/mdoc_validate.c b/mdoc_validate.c
index bf6b5ffca0c2d9b3be44f4ea81f2ac604f40c24b..2e725d1cc903aaf3ac3192b771b4a0f5e1b8803f 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.202 2014/01/11 22:16:10 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.203 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -36,6 +36,7 @@
 
 #include "mdoc.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 

diff --git a/msec.c b/msec.c
index dd7d11c650fa0e6d1e2beb84b032ce093d01f526..3db04d66635d2db3092ad984191e9ad815cffdaf 100644 (file)
--- a/msec.c
+++ b/msec.c
@@ -1,4 +1,4 @@
-/*     $Id: msec.c,v 1.10 2011/12/02 01:37:14 schwarze Exp $ */
+/*     $Id: msec.c,v 1.11 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"

diff --git a/out.c b/out.c
index c931664977899a0adf99f2239b5ef36fb52ae6f2..96d1d771d3ef552a41a9d2272acc2329e87708e0 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.46 2013/10/05 20:30:05 schwarze Exp $ */
+/*     $Id: out.c,v 1.47 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mandoc_aux.h"
 #include "mandoc.h"
 #include "out.h"
 

diff --git a/read.c b/read.c
index a99ca0584ccfb1fffaf289b9b82d5d39c46da93c..d78a0b0d6dee2f406767662659abb47ad4cf9a31 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.45 2014/03/19 22:20:43 schwarze Exp $ */
+/*     $Id: read.c,v 1.46 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -37,6 +37,7 @@
 #include <unistd.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "mdoc.h"
 #include "man.h"

diff --git a/roff.c b/roff.c
index 7c46e9a593a96f9613227097720500374f585a3a..642355294fa9ff15e88cffb2afeac2f18a2a5648 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.200 2014/03/20 02:57:28 schwarze Exp $ */
+/*     $Id: roff.c,v 1.201 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libroff.h"
 #include "libmandoc.h"
 

diff --git a/st.c b/st.c
index 70c21a269e8d6c5e216bc3a217de184bdf710f57..ab6f0f2918637d01b8b058f9eb220b28b4638464 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,4 +1,4 @@
-/*     $Id: st.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */
+/*     $Id: st.c,v 1.10 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,12 +18,9 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "mdoc.h"
-#include "mandoc.h"
 #include "libmdoc.h"
 
 #define LINE(x, y) \

diff --git a/tbl.c b/tbl.c
index b244ac80acfa47d5ff56841cc91366a20c4381a3..a99436ed7e7f5662c2be4d8ced950f02c5338a71 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.27 2013/05/31 22:08:09 schwarze Exp $ */
+/*     $Id: tbl.c,v 1.28 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 

diff --git a/tbl_data.c b/tbl_data.c
index 9c56002fa543570049aa8d450c700490ceb753d6..dfb85bd27cdac7c5147be61bebd5d48ab3c6af7c 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.28 2014/01/05 18:37:53 joerg Exp $ */
+/*     $Id: tbl_data.c,v 1.29 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 

diff --git a/tbl_layout.c b/tbl_layout.c
index 6cce977fa2e74f9a8fd33a852818a61dc8a58d8b..c30ea25bf587345f1427542ef1cdaa1dd1d8d2b7 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_layout.c,v 1.23 2012/05/27 17:54:54 schwarze Exp $ */
+/*     $Id: tbl_layout.c,v 1.24 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -19,13 +19,13 @@
 #include "config.h"
 #endif
 
-#include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 

diff --git a/term.c b/term.c
index d3b217745149e2f9741ddfe43a17c530440569a2..158b7d14f820f0ff541c91ee684ccc33d38ecd69 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.217 2014/03/13 19:23:50 schwarze Exp $ */
+/*     $Id: term.c,v 1.218 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -23,12 +23,12 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "term.h"
 #include "main.h"

diff --git a/term_ascii.c b/term_ascii.c
index cb7ac294059e995d51219c55b207175009445143..d6531167703b98db162141aff04b3e85ba41a6da 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.21 2013/06/01 14:27:20 schwarze Exp $ */
+/*     $Id: term_ascii.c,v 1.22 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -20,7 +20,6 @@
 
 #include <sys/types.h>
 
-#include <assert.h>
 #ifdef USE_WCHAR
 # include <locale.h>
 #endif
@@ -33,6 +32,7 @@
 #endif
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "term.h"
 #include "main.h"

diff --git a/term_ps.c b/term_ps.c
index b464b842eae5f77f4fb874ad5dcaf01d9d8838b0..c80105913f3283b1661c95219b725f83aa1c7c5e 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ps.c,v 1.55 2014/01/05 19:10:56 joerg Exp $ */
+/*     $Id: term_ps.c,v 1.56 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "main.h"
 #include "term.h"

diff --git a/vol.c b/vol.c
index 3ea7441a42191d64711d635aaeb607f0b725c2b5..7658ea425a1fc83e890c18b6f329b98c8d17d5e8 100644 (file)
--- a/vol.c
+++ b/vol.c
@@ -1,4 +1,4 @@
-/*     $Id: vol.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */
+/*     $Id: vol.c,v 1.10 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,12 +18,9 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "mdoc.h"
-#include "mandoc.h"
 #include "libmdoc.h"
 
 #define LINE(x, y) \