Remove some stray argument names from function prototypes,

for consistency with the dominant style used in mandoc.
No functional change.
Patch from Martin Vahlensieck <academicsolutions dot ch>.

diff --git a/cgi.c b/cgi.c
index d40fcb8e187a31fec756c92e0f6e46c43634a253..6d0e3293a95db6fa58fc79f6d3401ede0b2eee9f 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,7 +1,7 @@
-/*     $Id: cgi.c,v 1.171 2020/01/10 15:21:19 schwarze Exp $ */
+/* $Id: cgi.c,v 1.172 2020/04/03 11:35:01 schwarze Exp $ */
 /*
- * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014-2019 Ingo Schwarze <schwarze@usta.de>
+ * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Implementation of the man.cgi(8) program.
  */
 #include "config.h"
 
@@ -70,9 +72,9 @@ enum  focus {
 static void             html_print(const char *);
 static void             html_putchar(char);
 static int              http_decode(char *);
-static void             http_encode(const char *p);
+static void             http_encode(const char *);
 static void             parse_manpath_conf(struct req *);
-static void             parse_path_info(struct req *req, const char *path);
+static void             parse_path_info(struct req *, const char *);
 static void             parse_query_string(struct req *, const char *);
 static void             pg_error_badrequest(const char *);
 static void             pg_error_internal(void);

diff --git a/libmandoc.h b/libmandoc.h
index 704244195f7e966148a8babda546460c87b6c345..33489c9a3821de76782a9fb8919bbf76e0a3c6a1 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: libmandoc.h,v 1.78 2020/01/19 16:44:50 schwarze Exp $ */
+/* $Id: libmandoc.h,v 1.79 2020/04/03 11:35:01 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013-2015,2017,2018,2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,9 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Internal interfaces for parser utilities needed by multiple parsers
+ * and the top-level functions to call the mdoc, man, and roff parsers.
  */
 
 /*
@@ -73,7 +76,7 @@ void           roff_man_reset(struct roff_man *);
 int             roff_parseln(struct roff *, int, struct buf *, int *);
 void            roff_userret(struct roff *);
 void            roff_endparse(struct roff *);
-void            roff_setreg(struct roff *, const char *, int, char sign);
+void            roff_setreg(struct roff *, const char *, int, char);
 int             roff_getreg(struct roff *, const char *);
 char           *roff_strdup(const struct roff *, const char *);
 char           *roff_getarg(struct roff *, char **, int, int *);

diff --git a/mandoc.h b/mandoc.h
index 8379f9727a8a139fc4d48e236a08d42f2123664f..d37b964009256418742f128d1af538dd081f6c2b 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.h,v 1.266 2020/01/19 18:02:00 schwarze Exp $ */
+/* $Id: mandoc.h,v 1.267 2020/04/03 11:35:01 schwarze Exp $ */
 /*
- * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,6 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Error handling, escape sequence, and character utilities.
+ * Can be used by all code in the mandoc package.
  */
 
 #define ASCII_NBRSP     31  /* non-breaking space */
@@ -299,7 +300,7 @@ enum        mandoc_esc {
 };
 
 
-enum mandoc_esc          mandoc_font(const char *, int sz);
+enum mandoc_esc          mandoc_font(const char *, int);
 enum mandoc_esc          mandoc_escape(const char **, const char **, int *);
 void             mandoc_msg_setoutfile(FILE *);
 const char      *mandoc_msg_getinfilename(void);

diff --git a/mandocdb.c b/mandocdb.c
index 4bfb2cf6182dd05283bac3f18defcf17d447eb2b..6a4e72c955572da6b7a593cba2656ba3b8fe089f 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,7 +1,7 @@
-/*     $Id: mandocdb.c,v 1.266 2020/01/26 21:25:41 schwarze Exp $ */
+/* $Id: mandocdb.c,v 1.267 2020/04/03 11:35:01 schwarze Exp $ */
 /*
- * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2016 Ed Maste <emaste@freebsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,6 +15,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Implementation of the makewhatis(8) program.
  */
 #include "config.h"
 
@@ -118,7 +120,7 @@ struct      mdoc_handler {
 int             mandocdb(int, char *[]);
 
 static void     dbadd(struct dba *, struct mpage *);
-static void     dbadd_mlink(const struct mlink *mlink);
+static void     dbadd_mlink(const struct mlink *);
 static void     dbprune(struct dba *);
 static void     dbwrite(struct dba *);
 static void     filescan(const char *);

diff --git a/mdoc_markdown.c b/mdoc_markdown.c
index 6877dbb13bd75f84c5185bdd64addbf88a10bf81..65bffea003713f437cd5e13b77e9570ce7777bba 100644 (file)
--- a/mdoc_markdown.c
+++ b/mdoc_markdown.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_markdown.c,v 1.34 2020/02/27 01:43:52 schwarze Exp $ */
+/* $Id: mdoc_markdown.c,v 1.35 2020/04/03 11:35:01 schwarze Exp $ */
 /*
  * Copyright (c) 2017, 2018, 2020 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -13,6 +13,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Markdown formatter for mdoc(7) used by mandoc(1).
  */
 #include <sys/types.h>
 
@@ -29,16 +31,16 @@
 #include "main.h"
 
 struct md_act {
-       int             (*cond)(struct roff_node *n);
-       int             (*pre)(struct roff_node *n);
-       void            (*post)(struct roff_node *n);
+       int             (*cond)(struct roff_node *);
+       int             (*pre)(struct roff_node *);
+       void            (*post)(struct roff_node *);
        const char       *prefix; /* pre-node string constant */
        const char       *suffix; /* post-node string constant */
 };
 
 static void     md_nodelist(struct roff_node *);
 static void     md_node(struct roff_node *);
-static const char *md_stack(char c);
+static const char *md_stack(char);
 static void     md_preword(void);
 static void     md_rawword(const char *);
 static void     md_word(const char *);

diff --git a/out.h b/out.h
index dec6a8f873247bde1fd0c446aa80f00da7069824..e621cbb7b92ea946d856661c5b7681ce4d663534 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,4 +1,4 @@
-/*     $Id: out.h,v 1.33 2018/08/18 20:18:14 schwarze Exp $ */
+/* $Id: out.h,v 1.34 2020/04/03 11:35:01 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Utilities for use by multiple mandoc(1) formatters.
  */
 
 enum   roffscale {
@@ -64,5 +66,5 @@ struct        rofftbl {
 struct tbl_span;
 
 const char      *a2roffsu(const char *, struct roffsu *, enum roffscale);
-void             tblcalc(struct rofftbl *tbl,
+void             tblcalc(struct rofftbl *,
                        const struct tbl_span *, size_t, size_t);

diff --git a/roff.c b/roff.c
index 635bbc34503898cb96c80bac996c277c431a6373..70cf4f376cd37bc458357334e8fa2ee99bde9900 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.371 2020/02/27 21:43:44 schwarze Exp $ */
+/* $Id: roff.c,v 1.372 2020/04/03 11:35:01 schwarze Exp $ */
 /*
- * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Implementation of the roff(7) parser for mandoc(1).
  */
 #include "config.h"
 
@@ -196,7 +198,7 @@ static      int              roff_ds(ROFF_ARGS);
 static int              roff_ec(ROFF_ARGS);
 static int              roff_eo(ROFF_ARGS);
 static int              roff_eqndelim(struct roff *, struct buf *, int);
-static int              roff_evalcond(struct roff *r, int, char *, int *);
+static int              roff_evalcond(struct roff *, int, char *, int *);
 static int              roff_evalnum(struct roff *, int,
                                const char *, int *, int *, int);
 static int              roff_evalpar(struct roff *, int,