diff options
| -rw-r--r-- | sail/dr_1.c | 6 | ||||
| -rw-r--r-- | sail/extern.h | 10 | ||||
| -rw-r--r-- | sail/globals.c | 12 | ||||
| -rw-r--r-- | sail/pl_1.c | 8 | ||||
| -rw-r--r-- | sail/pl_2.c | 6 | ||||
| -rw-r--r-- | sail/pl_7.c | 16 | ||||
| -rw-r--r-- | sail/player.h | 8 | ||||
| -rw-r--r-- | sail/sync.c | 10 |
8 files changed, 40 insertions, 36 deletions
diff --git a/sail/dr_1.c b/sail/dr_1.c index 7fa015ee..658df26a 100644 --- a/sail/dr_1.c +++ b/sail/dr_1.c @@ -1,4 +1,4 @@ -/* $NetBSD: dr_1.c,v 1.15 2001/01/04 03:51:23 jwise Exp $ */ +/* $NetBSD: dr_1.c,v 1.16 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dr_1.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dr_1.c,v 1.15 2001/01/04 03:51:23 jwise Exp $"); +__RCSID("$NetBSD: dr_1.c,v 1.16 2001/01/04 05:34:56 jwise Exp $"); #endif #endif /* not lint */ @@ -233,7 +233,7 @@ fightitout(struct ship *from, struct ship *to, int key) } sprintf(message, "captured by the %s!", to->shipname); Writestr(W_SIGNAL, from, message); - (void) sprintf(message, "killed in melee: %d. %s: %d", + sprintf(message, "killed in melee: %d. %s: %d", totalto, from->shipname, totalfrom); Writestr(W_SIGNAL, to, message); mento = 0; diff --git a/sail/extern.h b/sail/extern.h index a7b68357..0d43c98e 100644 --- a/sail/extern.h +++ b/sail/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.22 2001/01/04 03:51:24 jwise Exp $ */ +/* $NetBSD: extern.h,v 1.23 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,9 +44,9 @@ extern int mode; #define MODE_LOGGER 3 /* command line flags */ -extern char randomize; /* -x, give first available ship */ -extern char longfmt; /* -l, print score in long format */ -extern char nobells; /* -b, don't ring bell before Signal */ +extern int randomize; /* -x, give first available ship */ +extern int longfmt; /* -l, print score in long format */ +extern int nobells; /* -b, don't ring bell before Signal */ /* other initial modes */ extern gid_t gid; @@ -290,7 +290,7 @@ extern int turn; extern int game; extern int alive; extern int people; -extern char hasdriver; +extern int hasdriver; /* assorted.c */ void table (int, int, int, struct ship *, struct ship *, int); diff --git a/sail/globals.c b/sail/globals.c index 1c1f41be..34153804 100644 --- a/sail/globals.c +++ b/sail/globals.c @@ -1,4 +1,4 @@ -/* $NetBSD: globals.c,v 1.11 2001/01/04 03:51:24 jwise Exp $ */ +/* $NetBSD: globals.c,v 1.12 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)globals.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: globals.c,v 1.11 2001/01/04 03:51:24 jwise Exp $"); +__RCSID("$NetBSD: globals.c,v 1.12 2001/01/04 05:34:56 jwise Exp $"); #endif #endif /* not lint */ @@ -550,9 +550,9 @@ const char dc[] = { 0, 0, -1, -1, -1, 0, 1, 1, 1 }; int mode; jmp_buf restart; -char randomize; /* -x, give first available ship */ -char longfmt; /* -l, print score in long format */ -char nobells; /* -b, don't ring bell before Signal */ +int randomize; /* -x, give first available ship */ +int longfmt; /* -l, print score in long format */ +int nobells; /* -b, don't ring bell before Signal */ gid_t gid; gid_t egid; @@ -566,4 +566,4 @@ int turn; int game; int alive; int people; -char hasdriver; +int hasdriver; diff --git a/sail/pl_1.c b/sail/pl_1.c index 03308384..33b1a686 100644 --- a/sail/pl_1.c +++ b/sail/pl_1.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_1.c,v 1.13 2001/01/04 04:41:41 jwise Exp $ */ +/* $NetBSD: pl_1.c,v 1.14 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pl_1.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_1.c,v 1.13 2001/01/04 04:41:41 jwise Exp $"); +__RCSID("$NetBSD: pl_1.c,v 1.14 2001/01/04 05:34:56 jwise Exp $"); #endif #endif /* not lint */ @@ -50,8 +50,8 @@ __RCSID("$NetBSD: pl_1.c,v 1.13 2001/01/04 04:41:41 jwise Exp $"); #include "extern.h" #include "player.h" -void leave(int); -void choke(int); +void leave(int) __attribute__((__noreturn__)); +void choke(int) __attribute__((__noreturn__)); void child(int); /* diff --git a/sail/pl_2.c b/sail/pl_2.c index 2d06040a..850dd98c 100644 --- a/sail/pl_2.c +++ b/sail/pl_2.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_2.c,v 1.8 2001/01/04 04:41:41 jwise Exp $ */ +/* $NetBSD: pl_2.c,v 1.9 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pl_2.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_2.c,v 1.8 2001/01/04 04:41:41 jwise Exp $"); +__RCSID("$NetBSD: pl_2.c,v 1.9 2001/01/04 05:34:56 jwise Exp $"); #endif #endif /* not lint */ @@ -46,7 +46,7 @@ __RCSID("$NetBSD: pl_2.c,v 1.8 2001/01/04 04:41:41 jwise Exp $"); #include "extern.h" #include "player.h" -void play(void); +void play(void) __attribute__((__noreturn__)); void play(void) diff --git a/sail/pl_7.c b/sail/pl_7.c index 7d6a5170..cc2cb5b7 100644 --- a/sail/pl_7.c +++ b/sail/pl_7.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_7.c,v 1.20 2001/01/04 04:41:42 jwise Exp $ */ +/* $NetBSD: pl_7.c,v 1.21 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_7.c,v 1.20 2001/01/04 04:41:42 jwise Exp $"); +__RCSID("$NetBSD: pl_7.c,v 1.21 2001/01/04 05:34:56 jwise Exp $"); #endif #endif /* not lint */ @@ -54,8 +54,10 @@ __RCSID("$NetBSD: pl_7.c,v 1.20 2001/01/04 04:41:42 jwise Exp $"); void initscreen(void); void cleanupscreen(void); void newturn(int); -void Signal(const char *, struct ship *, ...); -void Msg(const char *, ...); +void Signal(const char *, struct ship *, ...) + __attribute__((__format__(__printf__,1,3))); +void Msg(const char *, ...) + __attribute__((__format__(__printf__,1,2))); static void Scroll(void); void prompt(const char *, struct ship *); static void endprompt(int); @@ -89,9 +91,9 @@ WINDOW *scroll_w; WINDOW *stat_w; WINDOW *turn_w; -char done_curses; -char loaded, fired, changed, repaired; -char dont_adjust; +int done_curses; +int loaded, fired, changed, repaired; +int dont_adjust; int viewrow, viewcol; char movebuf[sizeof SHIP(0)->file->movebuf]; int player; diff --git a/sail/player.h b/sail/player.h index 352b818a..ea7cde4b 100644 --- a/sail/player.h +++ b/sail/player.h @@ -1,4 +1,4 @@ -/* $NetBSD: player.h,v 1.9 2001/01/04 04:41:42 jwise Exp $ */ +/* $NetBSD: player.h,v 1.10 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -89,9 +89,9 @@ #define SLOT_B VIEW_B #define SLOT_R (SLOT_L+SLOT_X-1) -extern char done_curses; -extern char loaded, fired, changed, repaired; -extern char dont_adjust; +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 char version[]; diff --git a/sail/sync.c b/sail/sync.c index d793aac5..b60b19f0 100644 --- a/sail/sync.c +++ b/sail/sync.c @@ -1,4 +1,4 @@ -/* $NetBSD: sync.c,v 1.18 2001/01/04 03:51:24 jwise Exp $ */ +/* $NetBSD: sync.c,v 1.19 2001/01/04 05:34:56 jwise Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)sync.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: sync.c,v 1.18 2001/01/04 03:51:24 jwise Exp $"); +__RCSID("$NetBSD: sync.c,v 1.19 2001/01/04 05:34:56 jwise Exp $"); #endif #endif /* not lint */ @@ -57,8 +57,10 @@ __RCSID("$NetBSD: sync.c,v 1.18 2001/01/04 03:51:24 jwise Exp $"); #define BUFSIZE 4096 void fmtship(char *, size_t, const char *, struct ship *); -void makesignal(struct ship *, const char *, struct ship *, ...); -void makemsg(struct ship *, const char *, ...); +void makesignal(struct ship *, const char *, struct ship *, ...) + __attribute__((__format__(__printf__,2,4))); +void makemsg(struct ship *, const char *, ...) + __attribute__((__format__(__printf__,2,3))); int sync_exists(int); int sync_open(void); void sync_close(int); |