From: Bob Little <Bob.Little@aeronix.com>
Date: Sat, 17 Jun 2017 22:19:09 +0000 (-0400)
Subject: Move a few prototypes and static'ed a few functions
X-Git-Tag: 1.1~274
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=a3485d2a41ae0360177c8b475972610025aec8f3;p=open-adventure.git

Move a few prototypes and static'ed a few functions

Moved prototypes for initialise() and action() from main.c to advent.h
Made the following functions static, so they wouldn't require prototypes:
   sig_handler (main.c)
   spotted_by_pirate (main.c)
   light (actions.c)
---

diff --git a/Makefile b/Makefile
index 08ec488..b0b06b9 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,8 @@ VERS=1.0
 
 CC?=gcc
 CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -Wextra -g
+CCFLAGS+=-Wstrict-prototypes
+CCFLAGS+=-Wmissing-prototypes
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -75,6 +77,7 @@ clean:
 	rm -f newdb.c newdb.h
 	rm -f README advent.6 MANIFEST *.tar.gz
 	rm -f *~
+	rm -f .*~
 	cd tests; $(MAKE) --quiet clean
 
 check: advent
diff --git a/actions.c b/actions.c
index 2132a9a..aa63f6c 100644
--- a/actions.c
+++ b/actions.c
@@ -633,7 +633,7 @@ static int inven(void)
     return GO_CLEAROBJ;
 }
 
-int light(token_t verb, token_t obj)
+static int light(token_t verb, token_t obj)
 /*  Light.  Applicable only to lamp and urn. */
 {
     int spk = ACTSPK[verb];
diff --git a/advent.h b/advent.h
index 2044cc2..1cc8784 100644
--- a/advent.h
+++ b/advent.h
@@ -171,6 +171,9 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
 
 enum speechpart {unknown, intransitive, transitive};
 
+void initialise(void);
+int action(FILE *input, enum speechpart part, long verb, token_t obj);
+
 /* Phase codes for action returns. 
  * These were at one time FORTRAN line numbers.
  * The values don't matter, but perturb their order at your peril.
diff --git a/main.c b/main.c
index 3a7c7db..3d23c96 100644
--- a/main.c
+++ b/main.c
@@ -48,10 +48,7 @@ bool oldstyle = false;
 bool editline = true;
 bool prompt = true;
 
-extern void initialise();
-extern int action(FILE *, long, long, long);
-
-void sig_handler(int signo)
+static void sig_handler(int signo)
 {
     if (signo == SIGINT){
 	if (logfp != NULL)
@@ -268,7 +265,7 @@ static void checkhints(FILE *cmdin)
     }
 }
 
-bool spotted_by_pirate(int i)
+static bool spotted_by_pirate(int i)
 {
     if (i != PIRATE) 
 	return false;