Remove some stray argument names from function prototypes,

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 8ea579b6bfc672fec6edb1b03e8d09757c45fb4d..bb3ec58bd0f71b2145e428c0fe9bfe5c4f16b0b8 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.269 2018/08/17 20:33:37 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.274 2018/12/31 07:46:07 schwarze Exp $ */

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


@@ -155,15 +155,6 @@ mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos,
        mdoc->next = ROFF_NEXT_CHILD;
 }
 
        mdoc->next = ROFF_NEXT_CHILD;
 }
 

-void
-mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p)
-{
-
-       roff_node_unlink(mdoc, p);
-       p->prev = p->next = NULL;
-       roff_node_append(mdoc, p);
-}
-

 /*
  * Parse free-form text, that is, a line that does not begin with the
  * control character.
 /*
  * Parse free-form text, that is, a line that does not begin with the
  * control character.


@@ -219,7 +210,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                         * Strip trailing tabs in literal context only;
                         * outside, they affect the next line.
                         */
                         * Strip trailing tabs in literal context only;
                         * outside, they affect the next line.
                         */

-                       if (MDOC_LITERAL & mdoc->flags)
+                       if (mdoc->flags & ROFF_NOFILL)

                                continue;
                        break;
                case '\\':
                                continue;
                        break;
                case '\\':


@@ -236,8 +227,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
        *end = '\0';
 
        if (ws)
        *end = '\0';
 
        if (ws)

-               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
-                   line, (int)(ws-buf), NULL);
+               mandoc_msg(MANDOCERR_SPACE_EOL, line, (int)(ws - buf), NULL);

 
        /*
         * Blank lines are allowed in no-fill mode
 
        /*
         * Blank lines are allowed in no-fill mode


@@ -245,7 +235,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
         * but add a single vertical space elsewhere.
         */
 
         * but add a single vertical space elsewhere.
         */
 

-       if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {
+       if (buf[offs] == '\0' && (mdoc->flags & ROFF_NOFILL) == 0) {

                switch (mdoc->last->type) {
                case ROFFT_TEXT:
                        sp = mdoc->last->string;
                switch (mdoc->last->type) {
                case ROFFT_TEXT:
                        sp = mdoc->last->string;


@@ -261,8 +251,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                default:
                        break;
                }
                default:
                        break;
                }

-               mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
-                   line, (int)(c - buf), NULL);
+               mandoc_msg(MANDOCERR_FI_BLANK, line, (int)(c - buf), NULL);

                roff_elem_alloc(mdoc, line, offs, ROFF_sp);
                mdoc->last->flags |= NODE_VALID | NODE_ENDED;
                mdoc->next = ROFF_NEXT_SIBLING;
                roff_elem_alloc(mdoc, line, offs, ROFF_sp);
                mdoc->last->flags |= NODE_VALID | NODE_ENDED;
                mdoc->next = ROFF_NEXT_SIBLING;


@@ -271,7 +260,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
 
        roff_word_alloc(mdoc, line, offs, buf+offs);
 
 
        roff_word_alloc(mdoc, line, offs, buf+offs);
 

-       if (mdoc->flags & MDOC_LITERAL)
+       if (mdoc->flags & ROFF_NOFILL)

                return 1;
 
        /*
                return 1;
 
        /*


@@ -302,8 +291,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                if (*c == ' ')
                        c++;
                if (isupper((unsigned char)(*c)))
                if (*c == ' ')
                        c++;
                if (isupper((unsigned char)(*c)))

-                       mandoc_msg(MANDOCERR_EOS, mdoc->parse,
-                           line, (int)(c - buf), NULL);
+                       mandoc_msg(MANDOCERR_EOS, line, (int)(c - buf), NULL);

        }
 
        return 1;
        }
 
        return 1;


@@ -331,8 +319,7 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
        if (sz == 2 || sz == 3)
                tok = roffhash_find(mdoc->mdocmac, buf + sv, sz);
        if (tok == TOKEN_NONE) {
        if (sz == 2 || sz == 3)
                tok = roffhash_find(mdoc->mdocmac, buf + sv, sz);
        if (tok == TOKEN_NONE) {

-               mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
-                   ln, sv, buf + sv - 1);
+               mandoc_msg(MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);

                return 1;
        }
 
                return 1;
        }
 


@@ -362,8 +349,7 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
         */
 
        if ('\0' == buf[offs] && ' ' == buf[offs - 1])
         */
 
        if ('\0' == buf[offs] && ' ' == buf[offs - 1])

-               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
-                   ln, offs - 1, NULL);
+               mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL);

 
        /*
         * If an initial macro or a list invocation, divert directly
 
        /*
         * If an initial macro or a list invocation, divert directly


@@ -442,12 +428,3 @@ mdoc_isdelim(const char *p)
 
        return DELIM_NONE;
 }
 
        return DELIM_NONE;
 }

-
-void
-mdoc_validate(struct roff_man *mdoc)
-{
-
-       mdoc->last = mdoc->first;
-       mdoc_node_validate(mdoc);
-       mdoc_state_reset(mdoc);
-}