summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormestre <mestre@openbsd.org>2015-12-26 00:26:39 +0000
committermestre <mestre@openbsd.org>2015-12-26 00:26:39 +0000
commit7ad55f558163bf40d70f36dd74055472237f6353 (patch)
tree611c9f82359c62089311eda890ab27d9c3ad8bb3
parent- use strtonum(3) instead of atoi(3) (diff)
downloadwireguard-openbsd-7ad55f558163bf40d70f36dd74055472237f6353.tar.xz
wireguard-openbsd-7ad55f558163bf40d70f36dd74055472237f6353.zip
Set as __dead a few more functions, that don't return, on games/
With precious tip, help and also OK from tb@
-rw-r--r--games/adventure/extern.h4
-rw-r--r--games/atc/extern.h6
-rw-r--r--games/backgammon/common_source/back.h4
-rw-r--r--games/battlestar/extern.h6
-rw-r--r--games/bs/bs.c4
-rw-r--r--games/canfield/canfield/canfield.c4
-rw-r--r--games/cribbage/cribbage.h4
-rw-r--r--games/gomoku/gomoku.h4
-rw-r--r--games/hack/hack.h6
-rw-r--r--games/hangman/hangman.h4
-rw-r--r--games/hunt/hunt/hunt.c4
-rw-r--r--games/hunt/huntd/server.h4
-rw-r--r--games/mille/mille.h4
-rw-r--r--games/phantasia/misc.c4
-rw-r--r--games/phantasia/setup.c4
-rw-r--r--games/pom/pom.c4
-rw-r--r--games/robots/robots.h4
-rw-r--r--games/sail/extern.h6
-rw-r--r--games/worm/worm.c4
19 files changed, 42 insertions, 42 deletions
diff --git a/games/adventure/extern.h b/games/adventure/extern.h
index 030ac195e4b..6ce753619c0 100644
--- a/games/adventure/extern.h
+++ b/games/adventure/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.7 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: extern.h,v 1.8 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: extern.h,v 1.3 1997/10/11 01:55:27 lukem Exp $ */
/*
@@ -96,7 +96,7 @@ int mback(void);
int specials(void);
int trbridge(void);
void badmove(void);
-void bug(int);
+__dead void bug(int);
void checkhints(void);
int trsay(void);
int trtake(void);
diff --git a/games/atc/extern.h b/games/atc/extern.h
index 5111ca05316..9dc0c15f48c 100644
--- a/games/atc/extern.h
+++ b/games/atc/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.9 2014/12/09 05:01:14 deraadt Exp $ */
+/* $OpenBSD: extern.h,v 1.10 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: extern.h,v 1.4 1995/04/27 21:22:22 mycroft Exp $ */
/*-
@@ -88,8 +88,8 @@ void ioerror(int, int, const char *);
void iomove(int);
int list_games(void);
int log_score(int);
-void log_score_quit(int);
-void loser(const PLANE *, const char *);
+__dead void log_score_quit(int);
+__dead void loser(const PLANE *, const char *);
char name(const PLANE *);
int next_plane(void);
void noise(void);
diff --git a/games/backgammon/common_source/back.h b/games/backgammon/common_source/back.h
index 4685ef965c2..7760f0aeea9 100644
--- a/games/backgammon/common_source/back.h
+++ b/games/backgammon/common_source/back.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: back.h,v 1.14 2015/12/02 20:05:01 tb Exp $ */
+/* $OpenBSD: back.h,v 1.15 2015/12/26 00:26:39 mestre Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -142,7 +142,7 @@ void fixcol(int, int, int, int, int);
void fixpos(int, int, int, int, int);
void getarg(int, char **);
void getmove(void);
-void getout(int); /* function to exit backgammon cleanly */
+__dead void getout(int); /* function to exit backgammon cleanly */
void gwrite(void);
void init(void);
void initcurses(void);
diff --git a/games/battlestar/extern.h b/games/battlestar/extern.h
index 89dfa59208e..1d6bde56fb0 100644
--- a/games/battlestar/extern.h
+++ b/games/battlestar/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.18 2015/12/04 17:34:40 tb Exp $ */
+/* $OpenBSD: extern.h,v 1.19 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: extern.h,v 1.5 1995/04/24 12:22:18 cgd Exp $ */
/*
@@ -330,7 +330,7 @@ void chime(void);
void convert(int);
void crash(void);
int cypher(void);
-void die(int);
+__dead void die(int);
void dig(void);
void dooropen(void);
int draw(void);
@@ -350,7 +350,7 @@ void kiss(void);
int land(void);
int launch(void);
void light(void);
-void live(void);
+__dead void live(void);
void love(void);
int moveplayer(int, int);
void murder(void);
diff --git a/games/bs/bs.c b/games/bs/bs.c
index fddba77a189..711c33ec016 100644
--- a/games/bs/bs.c
+++ b/games/bs/bs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bs.c,v 1.33 2015/12/25 03:20:57 mestre Exp $ */
+/* $OpenBSD: bs.c,v 1.34 2015/12/26 00:26:39 mestre Exp $ */
/*
* Copyright (c) 1986, Bruce Holloway
* All rights reserved.
@@ -83,7 +83,7 @@ static void randomplace(int, ship_t *);
static int rnd(int);
static int scount(int);
static int sgetc(char *);
-static void uninitgame(int);
+__dead static void uninitgame(int);
__dead void usage(void);
/*
diff --git a/games/canfield/canfield/canfield.c b/games/canfield/canfield/canfield.c
index 9caff843064..f87a1ef872b 100644
--- a/games/canfield/canfield/canfield.c
+++ b/games/canfield/canfield/canfield.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canfield.c,v 1.22 2015/12/02 18:34:10 tb Exp $ */
+/* $OpenBSD: canfield.c,v 1.23 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: canfield.c,v 1.7 1995/05/13 07:28:35 jtc Exp $ */
/*
@@ -186,7 +186,7 @@ time_t acctstart;
int dbfd = -1;
void askquit(int);
-void cleanup(int) __attribute__((__noreturn__));
+__dead void cleanup(int);
void cleanupboard(void);
void clearabovemovebox(void);
void clearbelowmovebox(void);
diff --git a/games/cribbage/cribbage.h b/games/cribbage/cribbage.h
index bcf33c04fb0..c6db9cf7288 100644
--- a/games/cribbage/cribbage.h
+++ b/games/cribbage/cribbage.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cribbage.h,v 1.10 2012/03/04 04:05:15 fgsch Exp $ */
+/* $OpenBSD: cribbage.h,v 1.11 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: cribbage.h,v 1.3 1995/03/21 15:08:46 cgd Exp $ */
/*
@@ -104,7 +104,7 @@ void printcard(WINDOW *, int, CARD, bool);
void prpeg(int, int, bool);
void prtable(int);
int readchar(void);
-void rintsig(int);
+__dead void rintsig(int);
int score(bool);
int scorehand(CARD [], CARD, int, bool, bool);
void shuffle(CARD []);
diff --git a/games/gomoku/gomoku.h b/games/gomoku/gomoku.h
index b9b58684161..08aa7f27d82 100644
--- a/games/gomoku/gomoku.h
+++ b/games/gomoku/gomoku.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gomoku.h,v 1.10 2012/03/04 04:05:15 fgsch Exp $ */
+/* $OpenBSD: gomoku.h,v 1.11 2015/12/26 00:26:39 mestre Exp $ */
/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -303,7 +303,7 @@ void panic(char *);
int pickmove(int);
void printcombo(struct combostr *, char *, size_t);
void qlog(char *);
-void quit(int);
+__dead void quit(int);
int readinput(FILE *);
void scanframes(int);
int sortcombo(struct combostr **, struct combostr **, struct combostr *);
diff --git a/games/hack/hack.h b/games/hack/hack.h
index 22e1f7c61fd..c72c011dadb 100644
--- a/games/hack/hack.h
+++ b/games/hack/hack.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.h,v 1.11 2015/09/27 05:13:11 guenther Exp $*/
+/* $OpenBSD: hack.h,v 1.12 2015/12/26 00:26:39 mestre Exp $*/
/* $NetBSD: hack.h,v 1.3 1995/03/23 08:30:21 cgd Exp $*/
/*
@@ -565,7 +565,7 @@ void outrumor(void);
/* hack.save.c */
int dosave(void);
-void hackhangup(int);
+__dead void hackhangup(int);
int dorecover(int);
struct obj *restobjchn(int);
struct monst *restmonchn(int);
@@ -660,7 +660,7 @@ void drown(void);
void gettty(void);
void settty(char *);
void setftty(void);
-void error(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
+__dead void error(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
void getlin(char *);
void getret(void);
void cgetret(char *);
diff --git a/games/hangman/hangman.h b/games/hangman/hangman.h
index a11ad75371a..aa35d4dce55 100644
--- a/games/hangman/hangman.h
+++ b/games/hangman/hangman.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hangman.h,v 1.9 2015/02/07 03:30:08 tedu Exp $ */
+/* $OpenBSD: hangman.h,v 1.10 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: hangman.h,v 1.5 1995/04/24 12:23:44 cgd Exp $ */
/*
@@ -89,7 +89,7 @@ extern int syms;
extern int symfd;
extern off_t symoffs, symsize;
-void die(int);
+__dead void die(int);
void endgame(void);
void getguess(void);
void getword(void);
diff --git a/games/hunt/hunt/hunt.c b/games/hunt/hunt/hunt.c
index 637e6aec4e6..4555007e91c 100644
--- a/games/hunt/hunt/hunt.c
+++ b/games/hunt/hunt/hunt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hunt.c,v 1.15 2015/10/24 18:35:08 mmcc Exp $ */
+/* $OpenBSD: hunt.c,v 1.16 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: hunt.c,v 1.8 1998/09/13 15:27:28 hubertf Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
@@ -81,7 +81,7 @@ static int in_visual;
static void dump_scores(void);
static long env_init(long);
static void fill_in_blanks(void);
-static void leave(int, char *) __attribute__((__noreturn__));
+__dead static void leave(int, char *);
static void sigterm(int);
static int find_driver(void);
diff --git a/games/hunt/huntd/server.h b/games/hunt/huntd/server.h
index 001e01fa4d6..c38a23da4b2 100644
--- a/games/hunt/huntd/server.h
+++ b/games/hunt/huntd/server.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.h,v 1.9 2004/01/16 00:13:19 espie Exp $ */
+/* $OpenBSD: server.h,v 1.10 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: hunt.h,v 1.5 1998/09/13 15:27:28 hubertf Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
@@ -230,7 +230,7 @@ void message(PLAYER *, char *);
/* driver.c */
int rand_num(int);
void checkdam(PLAYER *, PLAYER *, IDENT *, int, char);
-void cleanup(int);
+__dead void cleanup(int);
/* execute.c */
void mon_execute(PLAYER *);
diff --git a/games/mille/mille.h b/games/mille/mille.h
index b066e0e5731..88358999219 100644
--- a/games/mille/mille.h
+++ b/games/mille/mille.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mille.h,v 1.11 2015/01/19 00:47:01 deraadt Exp $ */
+/* $OpenBSD: mille.h,v 1.12 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: mille.h,v 1.5 1995/03/24 05:01:51 cgd Exp $ */
/*
@@ -224,7 +224,7 @@ int canplay(const PLAY *, const PLAY *, CARD);
int check_ext(bool);
void check_go(void);
void check_more(void);
-void die(int);
+__dead void die(int);
void domove(void);
bool error(char *, ...);
void finalscore(PLAY *);
diff --git a/games/phantasia/misc.c b/games/phantasia/misc.c
index ccab3f5daa1..1010de22945 100644
--- a/games/phantasia/misc.c
+++ b/games/phantasia/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.16 2014/07/12 03:41:04 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.17 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: misc.c,v 1.2 1995/03/24 03:59:03 cgd Exp $ */
/*
@@ -1414,7 +1414,7 @@ readmessage()
/
*************************************************************************/
-void
+__dead void
error(whichfile)
char *whichfile;
{
diff --git a/games/phantasia/setup.c b/games/phantasia/setup.c
index d3cd785ba25..cfeab03ee00 100644
--- a/games/phantasia/setup.c
+++ b/games/phantasia/setup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setup.c,v 1.13 2014/11/16 04:49:48 guenther Exp $ */
+/* $OpenBSD: setup.c,v 1.14 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: setup.c,v 1.4 1995/04/24 12:24:41 cgd Exp $ */
/*
@@ -10,7 +10,7 @@
#include <limits.h>
#include <fcntl.h>
-void Error(char *, char *);
+__dead void Error(char *, char *);
/* */
/************************************************************************
diff --git a/games/pom/pom.c b/games/pom/pom.c
index b9ad28102cc..dc03aa5ce63 100644
--- a/games/pom/pom.c
+++ b/games/pom/pom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pom.c,v 1.18 2015/10/24 17:33:05 mmcc Exp $ */
+/* $OpenBSD: pom.c,v 1.19 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: pom.c,v 1.6 1996/02/06 22:47:29 jtc Exp $ */
/*
@@ -72,7 +72,7 @@ void adj360(double *);
double dtor(double);
double potm(double);
time_t parsetime(char *);
-void badformat(void);
+__dead void badformat(void);
int
main(int argc, char *argv[])
diff --git a/games/robots/robots.h b/games/robots/robots.h
index f33f91c760c..8f2ff8264de 100644
--- a/games/robots/robots.h
+++ b/games/robots/robots.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: robots.h,v 1.12 2015/12/25 20:59:09 mestre Exp $ */
+/* $OpenBSD: robots.h,v 1.13 2015/12/26 00:26:39 mestre Exp $ */
/* $NetBSD: robots.h,v 1.5 1995/04/24 12:24:54 cgd Exp $ */
/*
@@ -126,7 +126,7 @@ void move_robots(void);
bool must_telep(void);
void play_level(void);
int query(char *);
-void quit(int);
+__dead void quit(int);
void reset_count(void);
int rnd(int);
COORD *rnd_pos(void);
diff --git a/games/sail/extern.h b/games/sail/extern.h
index f6b2b1b60e4..90414e63b11 100644
--- a/games/sail/extern.h
+++ b/games/sail/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.10 2014/03/11 07:42:55 guenther Exp $ */
+/* $OpenBSD: extern.h,v 1.11 2015/12/26 00:26:40 mestre Exp $ */
/* $NetBSD: extern.h,v 1.8 1998/09/13 15:27:30 hubertf Exp $ */
/*
@@ -368,9 +368,9 @@ int boarding(struct ship *, int);
void unboard(struct ship *, struct ship *, int);
/* pl_1.c */
-void leave(int) __attribute__((__noreturn__));
-void choke(int) __attribute__((__noreturn__));
void child(int);
+__dead void choke(int);
+__dead void leave(int);
/* pl_2.c */
__dead void play(void);
diff --git a/games/worm/worm.c b/games/worm/worm.c
index c3f3eeca046..aa8d77f0a78 100644
--- a/games/worm/worm.c
+++ b/games/worm/worm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: worm.c,v 1.34 2015/11/21 05:29:42 deraadt Exp $ */
+/* $OpenBSD: worm.c,v 1.35 2015/12/26 00:26:40 mestre Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -72,7 +72,7 @@ char outbuf[BUFSIZ];
volatile sig_atomic_t wantleave = 0;
volatile sig_atomic_t wantsuspend = 0;
-void crash(void);
+__dead void crash(void);
void display(struct body *, char);
void leave(int);
void life(void);