Cleanup, no functional change:

[mandoc.git] / demandoc.c

diff --git a/demandoc.c b/demandoc.c
index 13b78903da0eb62b3a843e145b33cd64b7268e8b..8b202ab023a0c2f5f45e9a0ef66ba33c35f68150 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.26 2016/01/08 02:53:13 schwarze Exp $ */
+/*     $Id: demandoc.c,v 1.29 2017/06/24 14:38:32 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -20,16 +20,15 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
 #include "roff.h"
 #include "man.h"
 #include "mdoc.h"
-#include "mandoc.h"
 
 static void     pline(int, int *, int *, int);
 static void     pman(const struct roff_node *, int *, int *, int);
@@ -79,7 +78,8 @@ main(int argc, char *argv[])
        argv += optind;
 
        mchars_alloc();
-       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, NULL);
+       mp = mparse_alloc(MPARSE_SO, MANDOCERR_MAX, NULL,
+           MANDOC_OS_OTHER, NULL);
        assert(mp);
 
        if (argc < 1)
@@ -240,7 +240,7 @@ pmdoc(const struct roff_node *p, int *line, int *col, int list)
 {
 
        for ( ; p; p = p->next) {
-               if (MDOC_LINE & p->flags)
+               if (NODE_LINE & p->flags)
                        pline(p->line, line, col, list);
                if (ROFFT_TEXT == p->type)
                        pstring(p->string, p->pos, col, list);
@@ -254,7 +254,7 @@ pman(const struct roff_node *p, int *line, int *col, int list)
 {
 
        for ( ; p; p = p->next) {
-               if (MAN_LINE & p->flags)
+               if (NODE_LINE & p->flags)
                        pline(p->line, line, col, list);
                if (ROFFT_TEXT == p->type)
                        pstring(p->string, p->pos, col, list);