summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormestre <mestre@openbsd.org>2015-12-25 20:59:09 +0000
committermestre <mestre@openbsd.org>2015-12-25 20:59:09 +0000
commitf0628b46ae621bae7650f74df86c15fcd5e2698f (patch)
tree5c91f68fa00e77cbeb14062e34b5e03f286190fc
parentfollwing -> following (diff)
downloadwireguard-openbsd-f0628b46ae621bae7650f74df86c15fcd5e2698f.tar.xz
wireguard-openbsd-f0628b46ae621bae7650f74df86c15fcd5e2698f.zip
Declare usage() functions as __dead void, if they don't return, on games section.
Found another one in arithmetic(6) which also didn't return, and removed a function from number(6) which is not used anymore. OK tb@
-rw-r--r--games/arithmetic/arithmetic.c6
-rw-r--r--games/boggle/boggle/extern.h4
-rw-r--r--games/factor/factor.c4
-rw-r--r--games/fish/fish.c4
-rw-r--r--games/fortune/fortune/fortune.c4
-rw-r--r--games/fortune/strfile/strfile.c4
-rw-r--r--games/grdc/grdc.c4
-rw-r--r--games/hangman/main.c4
-rw-r--r--games/number/number.c5
-rw-r--r--games/pig/pig.c4
-rw-r--r--games/ppt/ppt.c4
-rw-r--r--games/primes/primes.c4
-rw-r--r--games/quiz/quiz.c4
-rw-r--r--games/random/random.c4
-rw-r--r--games/robots/robots.h4
-rw-r--r--games/tetris/tetris.c4
-rw-r--r--games/wump/wump.c4
17 files changed, 35 insertions, 36 deletions
diff --git a/games/arithmetic/arithmetic.c b/games/arithmetic/arithmetic.c
index fce5bcac5e2..7c5ca4c7e6e 100644
--- a/games/arithmetic/arithmetic.c
+++ b/games/arithmetic/arithmetic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arithmetic.c,v 1.21 2015/10/24 17:13:27 mmcc Exp $ */
+/* $OpenBSD: arithmetic.c,v 1.22 2015/12/25 20:59:09 mestre Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -71,12 +71,12 @@
#include <unistd.h>
int getrandom(int, int, int);
-void intr(int);
+__dead void intr(int);
int opnum(int);
void penalise(int, int, int);
int problem(void);
void showstats(void);
-void usage(void);
+__dead void usage(void);
const char keylist[] = "+-x/";
const char defaultkeys[] = "+-";
diff --git a/games/boggle/boggle/extern.h b/games/boggle/boggle/extern.h
index d0bd14c109c..d7070ced341 100644
--- a/games/boggle/boggle/extern.h
+++ b/games/boggle/boggle/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.8 2014/12/04 06:12:33 deraadt Exp $ */
+/* $OpenBSD: extern.h,v 1.9 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: extern.h,v 1.3 1995/04/24 12:22:37 cgd Exp $ */
/*-
@@ -66,5 +66,5 @@ void starttime(void);
void startwords(void);
void stoptime(void);
int timerch(void);
-void usage(void);
+__dead void usage(void);
int validword(char *);
diff --git a/games/factor/factor.c b/games/factor/factor.c
index 56cc0dc3d14..173f24be3d0 100644
--- a/games/factor/factor.c
+++ b/games/factor/factor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: factor.c,v 1.22 2015/10/24 17:31:00 mmcc Exp $ */
+/* $OpenBSD: factor.c,v 1.23 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: factor.c,v 1.5 1995/03/23 08:28:07 cgd Exp $ */
/*
@@ -78,7 +78,7 @@ extern const int pattern_size;
void pr_fact(u_int64_t); /* print factors of a value */
void pr_bigfact(u_int64_t);
-void usage(void);
+__dead void usage(void);
int
main(int argc, char *argv[])
diff --git a/games/fish/fish.c b/games/fish/fish.c
index 19fb751b3f7..4602ce355b5 100644
--- a/games/fish/fish.c
+++ b/games/fish/fish.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fish.c,v 1.18 2015/11/30 08:42:03 tb Exp $ */
+/* $OpenBSD: fish.c,v 1.19 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: fish.c,v 1.3 1995/03/23 08:28:18 cgd Exp $ */
/*-
@@ -79,7 +79,7 @@ int nrandom(int);
void printhand(const int *);
void printplayer(int);
int promove(void);
-void usage(void);
+__dead void usage(void);
int usermove(void);
int
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index 1c9da5b4aee..3250420be74 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fortune.c,v 1.47 2015/11/10 15:29:11 deraadt Exp $ */
+/* $OpenBSD: fortune.c,v 1.48 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $ */
/*-
@@ -136,7 +136,7 @@ void print_file_list(void);
void print_list(FILEDESC *, int);
void sum_noprobs(FILEDESC *);
void sum_tbl(STRFILE *, STRFILE *);
-void usage(void);
+__dead void usage(void);
void zero_tbl(STRFILE *);
char *conv_pat(char *);
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index c44c37fb8e9..579ea18a55e 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strfile.c,v 1.23 2015/10/24 18:33:22 mmcc Exp $ */
+/* $OpenBSD: strfile.c,v 1.24 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: strfile.c,v 1.4 1995/04/24 12:23:09 cgd Exp $ */
/*-
@@ -114,7 +114,7 @@ void do_order(void);
void getargs(int, char **);
void randomize(void);
char *unctrl(char);
-void usage(void);
+__dead void usage(void);
/*
* main:
diff --git a/games/grdc/grdc.c b/games/grdc/grdc.c
index 89c6e661ff2..9a06a746f55 100644
--- a/games/grdc/grdc.c
+++ b/games/grdc/grdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grdc.c,v 1.21 2015/12/09 02:00:40 jsg Exp $ */
+/* $OpenBSD: grdc.c,v 1.22 2015/12/25 20:59:09 mestre Exp $ */
/*
*
* Copyright 2002 Amos Shapir. Public domain.
@@ -42,7 +42,7 @@ int hascolor = 0;
void set(int, int);
void standt(int);
void getwinsize(int *, int *);
-void usage(void);
+__dead void usage(void);
void
sighndl(int signo)
diff --git a/games/hangman/main.c b/games/hangman/main.c
index 6229ecb559d..423c65d4857 100644
--- a/games/hangman/main.c
+++ b/games/hangman/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.13 2015/10/22 05:28:42 doug Exp $ */
+/* $OpenBSD: main.c,v 1.14 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: main.c,v 1.3 1995/03/23 08:32:50 cgd Exp $ */
/*
@@ -33,7 +33,7 @@
# include "hangman.h"
#include <paths.h>
-void usage();
+__dead void usage(void);
/*
* This game written by Ken Arnold.
diff --git a/games/number/number.c b/games/number/number.c
index a8053c65cf4..d0e97ac40c2 100644
--- a/games/number/number.c
+++ b/games/number/number.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: number.c,v 1.16 2015/10/24 18:37:23 mmcc Exp $ */
+/* $OpenBSD: number.c,v 1.17 2015/12/25 20:59:09 mestre Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -67,9 +67,8 @@ void convert(char *);
void convertexp(char *);
int number(const char *, int);
void pfract(int);
-void toobig(void);
int unit(int, const char *);
-void usage(void);
+__dead void usage(void);
int lflag;
diff --git a/games/pig/pig.c b/games/pig/pig.c
index 9c64fb493b2..d0a30c724ca 100644
--- a/games/pig/pig.c
+++ b/games/pig/pig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pig.c,v 1.13 2015/10/24 18:29:15 mmcc Exp $ */
+/* $OpenBSD: pig.c,v 1.14 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: pig.c,v 1.2 1995/03/23 08:41:40 cgd Exp $ */
/*-
@@ -40,7 +40,7 @@
#include <unistd.h>
void pigout(char *, int);
-void usage(void);
+__dead void usage(void);
int
main(int argc, char *argv[])
diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c
index a40a8c9178f..e7a050137cd 100644
--- a/games/ppt/ppt.c
+++ b/games/ppt/ppt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppt.c,v 1.13 2015/10/14 08:12:12 doug Exp $ */
+/* $OpenBSD: ppt.c,v 1.14 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: ppt.c,v 1.4 1995/03/23 08:35:40 cgd Exp $ */
/*
@@ -41,7 +41,7 @@
#define EDGE "___________"
-void usage(void);
+__dead void usage(void);
void putppt(int);
int getppt(const char *buf);
diff --git a/games/primes/primes.c b/games/primes/primes.c
index b8baf1b2fe0..148ddb2359e 100644
--- a/games/primes/primes.c
+++ b/games/primes/primes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: primes.c,v 1.18 2015/11/30 08:53:53 tb Exp $ */
+/* $OpenBSD: primes.c,v 1.19 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $ */
/*
@@ -93,7 +93,7 @@ extern const int pattern_size; /* length of pattern array */
void primes(ubig, ubig);
ubig read_num_buf(void);
-void usage(void);
+__dead void usage(void);
int
main(int argc, char *argv[])
diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c
index af3d8d3f9bc..704d3c2bdd8 100644
--- a/games/quiz/quiz.c
+++ b/games/quiz/quiz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quiz.c,v 1.23 2015/12/06 09:55:58 tb Exp $ */
+/* $OpenBSD: quiz.c,v 1.24 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: quiz.c,v 1.9 1995/04/22 10:16:58 cgd Exp $ */
/*-
@@ -58,7 +58,7 @@ const char *next_cat(const char *);
void quiz(void);
void score(u_int, u_int, u_int);
void show_index(void);
-void usage(void);
+__dead void usage(void);
int
main(int argc, char *argv[])
diff --git a/games/random/random.c b/games/random/random.c
index a23942504b0..f8fd45343ab 100644
--- a/games/random/random.c
+++ b/games/random/random.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: random.c,v 1.14 2015/11/04 21:22:10 tedu Exp $ */
+/* $OpenBSD: random.c,v 1.15 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: random.c,v 1.3 1995/04/22 07:44:05 cgd Exp $ */
/*
@@ -45,7 +45,7 @@
#include <unistd.h>
#include <limits.h>
-void usage(void);
+__dead void usage(void);
int
main(int argc, char *argv[])
diff --git a/games/robots/robots.h b/games/robots/robots.h
index 1a9b0ca289b..f33f91c760c 100644
--- a/games/robots/robots.h
+++ b/games/robots/robots.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: robots.h,v 1.11 2015/12/04 16:40:09 tb Exp $ */
+/* $OpenBSD: robots.h,v 1.12 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: robots.h,v 1.5 1995/04/24 12:24:54 cgd Exp $ */
/*
@@ -134,4 +134,4 @@ void score(int);
void set_name(SCORE *);
void show_score(void);
int sign(int);
-void usage(void);
+__dead void usage(void);
diff --git a/games/tetris/tetris.c b/games/tetris/tetris.c
index 41d68e318d1..629694729fa 100644
--- a/games/tetris/tetris.c
+++ b/games/tetris/tetris.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tetris.c,v 1.26 2015/11/20 07:40:23 tb Exp $ */
+/* $OpenBSD: tetris.c,v 1.27 2015/12/25 20:59:09 mestre Exp $ */
/* $NetBSD: tetris.c,v 1.2 1995/04/22 07:42:47 cgd Exp $ */
/*-
@@ -68,7 +68,7 @@ static void elide(void);
static void setup_board(void);
const struct shape *randshape(void);
void onintr(int);
-void usage(void);
+__dead void usage(void);
/*
* Set up the initial board. The bottom display row is completely set,
diff --git a/games/wump/wump.c b/games/wump/wump.c
index fe42fc54882..ca8670e1d51 100644
--- a/games/wump/wump.c
+++ b/games/wump/wump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wump.c,v 1.27 2015/11/30 09:00:02 tb Exp $ */
+/* $OpenBSD: wump.c,v 1.28 2015/12/25 20:59:09 mestre Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -123,7 +123,7 @@ void pit_survive(void);
int shoot(char *);
void shoot_self(void);
int take_action(void);
-void usage(void);
+__dead void usage(void);
void wump_kill(void);
void wump_bat_kill(void);
void wump_walk_kill(void);