diff options
Diffstat (limited to 'sail')
| -rw-r--r-- | sail/extern.h | 4 | ||||
| -rw-r--r-- | sail/globals.c | 8 | ||||
| -rw-r--r-- | sail/lo_main.c | 6 | ||||
| -rw-r--r-- | sail/pl_7.c | 8 | ||||
| -rw-r--r-- | sail/player.h | 3 |
5 files changed, 14 insertions, 15 deletions
diff --git a/sail/extern.h b/sail/extern.h index 06006683..5492001a 100644 --- a/sail/extern.h +++ b/sail/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.34 2009/03/15 03:33:56 dholland Exp $ */ +/* $NetBSD: extern.h,v 1.35 2009/08/12 09:05:08 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -209,7 +209,6 @@ struct shipspecs { int rig4; short pts; }; -extern struct shipspecs specs[]; extern struct scenario *cc; /* the current scenario */ extern struct ship *ls; /* &cc->ship[cc->vessels] */ @@ -343,7 +342,6 @@ void Signal(const char *, struct ship *, ...) __attribute__((__format__(__printf__,1,3))); void Msg(const char *, ...) __attribute__((__format__(__printf__,1,2))); -void prompt(const char *, struct ship *); int sgetch(const char *, struct ship *, int); void sgetstr(const char *, char *, int); void centerview(void); diff --git a/sail/globals.c b/sail/globals.c index ec0dcb1f..0f34bae1 100644 --- a/sail/globals.c +++ b/sail/globals.c @@ -1,4 +1,4 @@ -/* $NetBSD: globals.c,v 1.14 2009/03/14 19:35:13 dholland Exp $ */ +/* $NetBSD: globals.c,v 1.15 2009/08/12 09:05:08 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)globals.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: globals.c,v 1.14 2009/03/14 19:35:13 dholland Exp $"); +__RCSID("$NetBSD: globals.c,v 1.15 2009/08/12 09:05:08 dholland Exp $"); #endif #endif /* not lint */ @@ -42,6 +42,8 @@ __RCSID("$NetBSD: globals.c,v 1.14 2009/03/14 19:35:13 dholland Exp $"); #include <setjmp.h> #include "extern.h" +static struct shipspecs specs[]; + struct scenario scene[] = { /* * int winddir; @@ -313,7 +315,7 @@ struct scenario scene[] = { }; int nscene = sizeof scene / sizeof (struct scenario); -struct shipspecs specs[] = { +static struct shipspecs specs[] = { /* bs fs ta guns hull crew1 crew3 gunR carR rig2 rig4 pts */ /* class qual crew2 gunL carL rig1 rig3 */ /*00*/{ 4, 7, 3, 19, 5, 5, 4, 2, 2, 2, 2, 2, 0, 0, 4, 4, 4, 4, 7 }, diff --git a/sail/lo_main.c b/sail/lo_main.c index b4902990..51954b92 100644 --- a/sail/lo_main.c +++ b/sail/lo_main.c @@ -1,4 +1,4 @@ -/* $NetBSD: lo_main.c,v 1.16 2009/03/14 20:14:56 dholland Exp $ */ +/* $NetBSD: lo_main.c,v 1.17 2009/08/12 09:05:08 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)lo_main.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: lo_main.c,v 1.16 2009/03/14 20:14:56 dholland Exp $"); +__RCSID("$NetBSD: lo_main.c,v 1.17 2009/08/12 09:05:08 dholland Exp $"); #endif #endif /* not lint */ @@ -51,7 +51,7 @@ __RCSID("$NetBSD: lo_main.c,v 1.16 2009/03/14 20:14:56 dholland Exp $"); #include "extern.h" #include "pathnames.h" -const char *const title[] = { +static const char *const title[] = { "Admiral", "Commodore", "Captain", "Captain", "Captain", "Captain", "Captain", "Commander", "Commander", "Lieutenant" diff --git a/sail/pl_7.c b/sail/pl_7.c index 001d4b09..7cefcaf5 100644 --- a/sail/pl_7.c +++ b/sail/pl_7.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_7.c,v 1.37 2009/03/15 22:19:23 dholland Exp $ */ +/* $NetBSD: pl_7.c,v 1.38 2009/08/12 09:05:08 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_7.c,v 1.37 2009/03/15 22:19:23 dholland Exp $"); +__RCSID("$NetBSD: pl_7.c,v 1.38 2009/08/12 09:05:08 dholland Exp $"); #endif #endif /* not lint */ @@ -86,7 +86,7 @@ static bool dbp[3]; int done_curses; int loaded, fired, changed, repaired; int dont_adjust; -int viewrow, viewcol; +static int viewrow, viewcol; char movebuf[sizeof SHIP(0)->file->movebuf]; int player; struct ship *ms; /* memorial structure, &cc->ship[player] */ @@ -291,7 +291,7 @@ Msg(const char *fmt, ...) scrollarea_add(buf); } -void +static void prompt(const char *p, struct ship *ship) { static char buf[BUFSIZ]; diff --git a/sail/player.h b/sail/player.h index 6f6c9db2..cb555a05 100644 --- a/sail/player.h +++ b/sail/player.h @@ -1,4 +1,4 @@ -/* $NetBSD: player.h,v 1.12 2009/03/14 20:10:43 dholland Exp $ */ +/* $NetBSD: player.h,v 1.13 2009/08/12 09:05:08 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -88,7 +88,6 @@ extern int done_curses; extern int loaded, fired, changed, repaired; extern int dont_adjust; -extern int viewrow, viewcol; extern char movebuf[sizeof SHIP(0)->file->movebuf]; extern const char version[]; extern int player; |