From b9729f21ecee00f10aeb911143988ae326aa17b7 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 29 Aug 2011 20:30:36 +0000 Subject: Use __dead --- banner/banner.c | 6 +++--- dab/board.h | 4 ++-- larn/bill.c | 6 +++--- larn/extern.h | 4 ++-- ppt/ppt.c | 9 ++++----- sail/extern.h | 4 ++-- trek/main.c | 8 +++----- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/banner/banner.c b/banner/banner.c index b30052b9..661e8abc 100644 --- a/banner/banner.c +++ b/banner/banner.c @@ -1,4 +1,4 @@ -/* $NetBSD: banner.c,v 1.18 2009/08/12 05:19:27 dholland Exp $ */ +/* $NetBSD: banner.c,v 1.19 2011/08/29 20:30:36 joerg Exp $ */ /* * Copyright (c) 1980, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993, 1994\ #if 0 static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; #else -__RCSID("$NetBSD: banner.c,v 1.18 2009/08/12 05:19:27 dholland Exp $"); +__RCSID("$NetBSD: banner.c,v 1.19 2011/08/29 20:30:36 joerg Exp $"); #endif #endif /* not lint */ @@ -1025,7 +1025,7 @@ static char print[DWIDTH]; static int debug, i, j, linen, max, nchars, pc, term, trace, x, y; static int width = DWIDTH; /* -w option: scrunch letters to 80 columns */ -static void +__dead static void toolong(void) { errx(EXIT_FAILURE, "message too long"); diff --git a/dab/board.h b/dab/board.h index 3fe5f7a0..2470703c 100644 --- a/dab/board.h +++ b/dab/board.h @@ -1,4 +1,4 @@ -/* $NetBSD: board.h,v 1.2 2008/04/28 20:22:53 martin Exp $ */ +/* $NetBSD: board.h,v 1.3 2011/08/29 20:30:37 joerg Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ class BOARD { void games(size_t i, const PLAYER& p); // Post games void total(size_t i, const PLAYER& p); // Post totals void ties(const PLAYER& p); // Post ties - void abort(const char *s, ...) const; // Algorithm error + __dead void abort(const char *s, ...) const; // Algorithm error private: diff --git a/larn/bill.c b/larn/bill.c index 59d33db7..961c424a 100644 --- a/larn/bill.c +++ b/larn/bill.c @@ -1,4 +1,4 @@ -/* $NetBSD: bill.c,v 1.10 2009/08/12 08:04:05 dholland Exp $ */ +/* $NetBSD: bill.c,v 1.11 2011/08/29 20:30:37 joerg Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)bill.c 5.2 (Berkeley) 5/28/91"; #else -__RCSID("$NetBSD: bill.c,v 1.10 2009/08/12 08:04:05 dholland Exp $"); +__RCSID("$NetBSD: bill.c,v 1.11 2011/08/29 20:30:37 joerg Exp $"); #endif #endif /* not lint */ @@ -119,7 +119,7 @@ static const char *mail[] = { */ void -mailbill() +mailbill(void) { int i; char fname[32]; diff --git a/larn/extern.h b/larn/extern.h index 8b725b7b..f0c681f6 100644 --- a/larn/extern.h +++ b/larn/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.15 2011/08/26 06:18:17 dholland Exp $ */ +/* $NetBSD: extern.h,v 1.16 2011/08/29 20:30:37 joerg Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -36,7 +36,7 @@ void act_ignore_altar(void); void act_open_chest(int, int); /* bill.c */ -void mailbill(void); +__dead void mailbill(void); /* config.c */ diff --git a/ppt/ppt.c b/ppt/ppt.c index 098f3da9..90c4504e 100644 --- a/ppt/ppt.c +++ b/ppt/ppt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppt.c,v 1.18 2009/08/12 08:24:20 dholland Exp $ */ +/* $NetBSD: ppt.c,v 1.19 2011/08/29 20:30:37 joerg Exp $ */ /* * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\ #if 0 static char sccsid[] = "@(#)ppt.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: ppt.c,v 1.18 2009/08/12 08:24:20 dholland Exp $"); +__RCSID("$NetBSD: ppt.c,v 1.19 2011/08/29 20:30:37 joerg Exp $"); #endif #endif /* not lint */ @@ -54,7 +54,7 @@ __RCSID("$NetBSD: ppt.c,v 1.18 2009/08/12 08:24:20 dholland Exp $"); static void putppt(int); static int getppt(const char *); -static void +__dead static void usage(void) { extern char *__progname; @@ -127,8 +127,7 @@ main(int argc, char **argv) } static void -putppt(c) - int c; +putppt(int c) { int i; diff --git a/sail/extern.h b/sail/extern.h index dd477ea7..5b6bbba3 100644 --- a/sail/extern.h +++ b/sail/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.37 2011/08/26 06:18:18 dholland Exp $ */ +/* $NetBSD: extern.h,v 1.38 2011/08/29 20:30:37 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -358,7 +358,7 @@ void startup(void); /* pl_main.c */ void pl_main_init(void); void pl_main_uninit(void); -void pl_main(void); +__dead void pl_main(void); /* sync.c */ void fmtship(char *, size_t, const char *, struct ship *); diff --git a/trek/main.c b/trek/main.c index 3c55293f..4f8a3b81 100644 --- a/trek/main.c +++ b/trek/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.22 2009/05/25 00:37:27 dholland Exp $ */ +/* $NetBSD: main.c,v 1.23 2011/08/29 20:30:37 joerg Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.22 2009/05/25 00:37:27 dholland Exp $"); +__RCSID("$NetBSD: main.c,v 1.23 2011/08/29 20:30:37 joerg Exp $"); #endif #endif /* not lint */ @@ -153,14 +153,12 @@ __RCSID("$NetBSD: main.c,v 1.22 2009/05/25 00:37:27 dholland Exp $"); jmp_buf env; -static void +__dead static void usage(const char *av0) { errx(1, "Usage: %s [-fs]", av0); } -int main(int, char **); - int main(int argc, char **argv) { -- cgit v1.2.3-56-ge451