Clean up fly.c by making local variables and functions static and

removing abs() macro.

diff --git a/battlestar/extern.h b/battlestar/extern.h
index 3257bfd779f4c0790197fcfcdd1122cbae91947e..ac85e7193f6e5a64356ee1bd65f72a2417c92ad9 100644 (file)
--- a/battlestar/extern.h
+++ b/battlestar/extern.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.22 2000/09/23 19:23:58 jsm Exp $ */
+/*     $NetBSD: extern.h,v 1.23 2000/09/24 09:44:28 jsm Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -317,7 +317,6 @@ extern const struct objs nightobjs[];
 
 #define DEFAULT_SAVE_FILE      ".Bstar"
 
-void blast __P((void));
 void bury __P((void));
 int card __P((const char *, int));
 void chime __P((void));
@@ -333,7 +332,6 @@ void drink __P((void));
 int drive __P((void));
 int drop __P((const char *));
 int eat __P((void));
-void endfly __P((void));
 int fight __P((int, int));
 int follow __P((void));
 char *getcom __P((char *, int, const char *, const char *));
@@ -350,12 +348,10 @@ void light __P((void));
 void live __P((void)) __attribute__((__noreturn__));
 struct wlist *lookup __P((const char *));
 void love __P((void));
-void moveenemy __P((int));
 int moveplayer __P((int, int));
 void murder __P((void));
 void news __P((void));
 void newway __P((int));
-void notarget __P((void));
 void open_score_file __P((void));
 void parse __P((void));
 void post __P((char));
@@ -368,12 +364,9 @@ void restore __P((const char *));
 int ride __P((void));
 void save __P((const char *));
 char *save_file_name __P((const char *, size_t));
-void screen __P((void));
 int shoot __P((void));
-void succumb __P((int));
 int take __P((unsigned int[]));
 int takeoff __P((void));
-void target __P((void));
 int throw __P((const char *));
 const char *truedirec __P((int, char));
 int ucard __P((const unsigned int *));

diff --git a/battlestar/fly.c b/battlestar/fly.c
index 0182f103b94e0f5b1f4227483549d0e6d2c929aa..9dcbcf083c91ad57089a7d6731a4004fa2bd6f2e 100644 (file)
--- a/battlestar/fly.c
+++ b/battlestar/fly.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: fly.c,v 1.8 1999/09/08 21:45:25 jsm Exp $      */
+/*     $NetBSD: fly.c,v 1.9 2000/09/24 09:44:28 jsm Exp $      */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)fly.c      8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: fly.c,v 1.8 1999/09/08 21:45:25 jsm Exp $");
+__RCSID("$NetBSD: fly.c,v 1.9 2000/09/24 09:44:28 jsm Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -46,18 +46,25 @@ __RCSID("$NetBSD: fly.c,v 1.8 1999/09/08 21:45:25 jsm Exp $");
 #undef UP
 #include <curses.h>
 
-#define abs(a) ((a) < 0 ? -(a) : (a))
 #define MIDR  (LINES/2 - 1)
 #define MIDC  (COLS/2 - 1)
 
-int     row, column;
-int     dr = 0, dc = 0;
-char    destroyed;
+static int     row, column;
+static int     dr = 0, dc = 0;
+static char    destroyed;
 int     ourclock = 120;                /* time for all the flights in the game */
-char    cross = 0;
-sig_t   oldsig;
+static char    cross = 0;
+static sig_t   oldsig;
 
-void
+static void blast __P((void));
+static void endfly __P((void));
+static void moveenemy __P((int));
+static void notarget __P((void));
+static void screen __P((void));
+static void succumb __P((int));
+static void target __P((void));
+
+static void
 succumb(dummy)
        int     dummy __attribute__((__unused__));
 {
@@ -178,7 +185,7 @@ visual()
        }
 }
 
-void
+static void
 screen()
 {
        int     r, c, n;
@@ -195,7 +202,7 @@ screen()
        refresh();
 }
 
-void
+static void
 target()
 {
        int     n;
@@ -208,7 +215,7 @@ target()
        }
 }
 
-void
+static void
 notarget()
 {
        int     n;
@@ -221,7 +228,7 @@ notarget()
        }
 }
 
-void
+static void
 blast()
 {
        int     n;
@@ -243,7 +250,7 @@ blast()
        alarm(1);
 }
 
-void
+static void
 moveenemy(dummy)
        int     dummy __attribute__((__unused__));
 {
@@ -283,7 +290,7 @@ moveenemy(dummy)
        alarm(1);
 }
 
-void
+static void
 endfly()
 {
        alarm(0);