No need to cast NULL when assigning it to a variable;

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index d15335709ecaa8b5820d1ecbba249e05cad54ae1..7fd17c53481baae9ece3328f99e31087fecaeed8 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.114 2016/01/08 17:48:09 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.115 2017/01/10 13:47:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -95,7 +95,7 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
 
                /* Reached the end of the document? */
 
-               if (to == NULL && ! (n->flags & MAN_VALID)) {
+               if (to == NULL && ! (n->flags & NODE_VALID)) {
                        if (man->flags & (MAN_BLINE | MAN_ELINE) &&
                            man_macros[n->tok].flags & MAN_SCOPED) {
                                mandoc_vmsg(MANDOCERR_BLK_LINE,
@@ -130,7 +130,7 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
 
                man->last = n;
                n = n->parent;
-               man->last->flags |= MAN_VALID;
+               man->last->flags |= NODE_VALID;
        }
 
        /*
@@ -164,7 +164,7 @@ rew_scope(struct roff_man *man, int tok)
        for (;;) {
                if (n->type == ROFFT_ROOT)
                        return;
-               if (n->flags & MAN_VALID) {
+               if (n->flags & NODE_VALID) {
                        n = n->parent;
                        continue;
                }
@@ -356,13 +356,13 @@ in_line_eoln(MACRO_PROT_ARGS)
        }
 
        /*
-        * Append MAN_EOS in case the last snipped argument
+        * Append NODE_EOS in case the last snipped argument
         * ends with a dot, e.g. `.IR syslog (3).'
         */
 
        if (n != man->last &&
            mandoc_eos(man->last->string, strlen(man->last->string)))
-               man->last->flags |= MAN_EOS;
+               man->last->flags |= NODE_EOS;
 
        /*
         * If no arguments are specified and this is MAN_SCOPED (i.e.,