s/[Nn]ull/NUL/ in comments where appropriate;

suggested by Thomas Klausner <wiz @ NetBSD dot org>.

diff --git a/man_macro.c b/man_macro.c
index d89298e2af5e53f39fb7a2c29502151e4d1fe7b3..479d0484c41f93acf58a83aca287fbe977ff72ef 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,7 +1,8 @@
-/*     $Id: man_macro.c,v 1.78 2013/12/22 13:25:17 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.79 2013/12/25 00:50:05 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/mandoc.c b/mandoc.c
index 2936ef936093fa2dff1d5dafd254db7c2d4aea31..80a206516f9f4c1722497a0482e4cbe037268ee2 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.70 2013/11/10 21:34:04 schwarze Exp $ */
+/*     $Id: mandoc.c,v 1.71 2013/12/25 00:50:05 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -419,10 +419,10 @@ mandoc_strdup(const char *ptr)
  * Parse a quoted or unquoted roff-style request or macro argument.
  * Return a pointer to the parsed argument, which is either the original
  * pointer or advanced by one byte in case the argument is quoted.
- * Null-terminate the argument in place.
+ * NUL-terminate the argument in place.
  * Collapse pairs of quotes inside quoted arguments.
  * Advance the argument pointer to the next argument,
- * or to the null byte terminating the argument line.
+ * or to the NUL byte terminating the argument line.
  */
 char *
 mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
@@ -493,7 +493,7 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
        if (1 == quoted)
                mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL);
 
-       /* Null-terminate this argument and move to the next one. */
+       /* NUL-terminate this argument and move to the next one. */
        if (pairs)
                cp[-pairs] = '\0';
        if ('\0' != *cp) {

diff --git a/mdoc_argv.c b/mdoc_argv.c
index 83f807759dee199c844ee7d0f6f4417f04284d52..bb9bc6c339b788980fbe37ae70cffa34c93a1c3e 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_argv.c,v 1.88 2013/12/22 14:06:36 schwarze Exp $ */
+/*     $Id: mdoc_argv.c,v 1.89 2013/12/25 00:50:05 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -536,12 +536,12 @@ args(struct mdoc *mdoc, int line, int *pos,
                        /* Skip ahead. */ ;
 
                return(rc);
-       } 
+       }
 
-       /* 
+       /*
         * Process a quoted literal.  A quote begins with a double-quote
         * and ends with a double-quote NOT preceded by a double-quote.
-        * Null-terminate the literal in place.
+        * NUL-terminate the literal in place.
         * Collapse pairs of quotes inside quoted literals.
         * Whitespace is NOT involved in literal termination.
         */

diff --git a/roff.c b/roff.c
index e4c43c13624deafd4318091c605729075cf7bd8a..e33216c40970f719a4f18da04d9bbf9e5f091be2 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.187 2013/12/15 21:23:52 schwarze Exp $ */
+/*     $Id: roff.c,v 1.188 2013/12/25 00:50:05 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -1733,7 +1733,7 @@ roff_userdef(ROFF_ARGS)
 
        /*
         * Collect pointers to macro argument strings
-        * and null-terminate them.
+        * and NUL-terminate them.
         */
        cp = *bufp + pos;
        for (i = 0; i < 9; i++)