From b055de7f5dca0b71396d14adec76802e4d947648 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 15 Jul 2016 18:03:45 +0000 Subject: add missing prototypes, no code change; noticed by Christos Zoulas with -Wmissing-prototypes --- Makefile.depend | 6 +++--- configure | 3 ++- main.c | 3 +++ man_hash.c | 2 ++ mandocdb.c | 3 +++ mdoc_argv.c | 1 + mdoc_hash.c | 2 ++ 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile.depend b/Makefile.depend index 98a1928b..d2d2e001 100644 --- a/Makefile.depend +++ b/Makefile.depend @@ -26,7 +26,7 @@ html.o: html.c config.h mandoc.h mandoc_aux.h out.h html.h manconf.h main.h lib.o: lib.c config.h roff.h mdoc.h libmdoc.h lib.in main.o: main.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h tag.h main.h manconf.h mansearch.h man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h -man_hash.o: man_hash.c config.h roff.h man.h libman.h +man_hash.o: man_hash.c config.h mandoc.h roff.h man.h libmandoc.h libman.h man_html.o: man_html.c config.h mandoc_aux.h roff.h man.h out.h html.h main.h man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h man_term.o: man_term.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h term.h main.h @@ -40,8 +40,8 @@ manpath.o: manpath.c config.h mandoc_aux.h manconf.h mansearch.o: mansearch.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h mansearch_const.o: mansearch_const.c config.h mansearch.h mdoc.o: mdoc.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h -mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h -mdoc_hash.o: mdoc_hash.c config.h roff.h mdoc.h libmdoc.h +mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_hash.o: mdoc_hash.c config.h mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h mdoc_html.o: mdoc_html.c config.h mandoc_aux.h roff.h mdoc.h out.h html.h main.h mdoc_macro.o: mdoc_macro.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h out.h main.h diff --git a/configure b/configure index 04768be4..9d670b43 100755 --- a/configure +++ b/configure @@ -35,7 +35,8 @@ MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man" OSNAME= CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -f -` -CFLAGS="-g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings" +CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings" +CFLAGS="${CFLAGS} -Wno-unused-parameter" LDADD= LDFLAGS= LD_OHASH= diff --git a/main.c b/main.c index b921bfe1..b8a773d4 100644 --- a/main.c +++ b/main.c @@ -87,6 +87,9 @@ struct curparse { struct manoutput *outopts; /* output options */ }; + +int mandocdb(int, char *[]); + static int fs_lookup(const struct manpaths *, size_t ipath, const char *, const char *, const char *, diff --git a/man_hash.c b/man_hash.c index f31d56a3..1df838ea 100644 --- a/man_hash.c +++ b/man_hash.c @@ -24,8 +24,10 @@ #include #include +#include "mandoc.h" #include "roff.h" #include "man.h" +#include "libmandoc.h" #include "libman.h" #define HASH_DEPTH 6 diff --git a/mandocdb.c b/mandocdb.c index 8a084451..40de09f1 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -139,6 +139,9 @@ struct mdoc_handler { uint64_t mask; /* set unless handler returns 0 */ }; + +int mandocdb(int, char *[]); + static void dbclose(int); static void dbadd(struct mpage *); static void dbadd_mlink(const struct mlink *mlink); diff --git a/mdoc_argv.c b/mdoc_argv.c index 49c8e04a..8366be39 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -29,6 +29,7 @@ #include "roff.h" #include "mdoc.h" #include "libmandoc.h" +#include "roff_int.h" #include "libmdoc.h" #define MULTI_STEP 5 /* pre-allocate argument values */ diff --git a/mdoc_hash.c b/mdoc_hash.c index 2204ac5a..d6453911 100644 --- a/mdoc_hash.c +++ b/mdoc_hash.c @@ -26,8 +26,10 @@ #include #include +#include "mandoc.h" #include "roff.h" #include "mdoc.h" +#include "libmandoc.h" #include "libmdoc.h" static unsigned char table[27 * 12]; -- cgit