From 41fe11cf9ab41d99a3c240f1d3fc238b94493d96 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 6 Sep 2011 18:33:01 +0000 Subject: Use __dead. Make a bunch of local functions static. --- usr.bin/tip/acu.c | 6 +++--- usr.bin/tip/aculib/hayes.c | 6 +++--- usr.bin/tip/cmds.c | 6 +++--- usr.bin/tip/cu.c | 8 ++++---- usr.bin/tip/hunt.c | 8 ++++---- usr.bin/tip/tip.c | 14 +++++++------- usr.bin/tip/tip.h | 10 +++++----- usr.bin/tip/tipout.c | 8 ++++---- 8 files changed, 33 insertions(+), 33 deletions(-) (limited to 'usr.bin/tip') diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c index c350cf89ada..ee91f3dfca4 100644 --- a/usr.bin/tip/acu.c +++ b/usr.bin/tip/acu.c @@ -1,4 +1,4 @@ -/* $NetBSD: acu.c,v 1.15 2006/12/14 17:09:43 christos Exp $ */ +/* $NetBSD: acu.c,v 1.16 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: acu.c,v 1.15 2006/12/14 17:09:43 christos Exp $"); +__RCSID("$NetBSD: acu.c,v 1.16 2011/09/06 18:33:01 joerg Exp $"); #endif /* not lint */ #include "tip.h" @@ -43,7 +43,7 @@ static acu_t *acu = NULL; static int conflag; static jmp_buf jmpbuf; -static void acuabort(int); +__dead static void acuabort(int); static acu_t *acutype(char *); /* diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c index 4cb49b09f3b..53f21956e68 100644 --- a/usr.bin/tip/aculib/hayes.c +++ b/usr.bin/tip/aculib/hayes.c @@ -1,4 +1,4 @@ -/* $NetBSD: hayes.c,v 1.16 2009/01/18 07:12:39 lukem Exp $ */ +/* $NetBSD: hayes.c,v 1.17 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: hayes.c,v 1.16 2009/01/18 07:12:39 lukem Exp $"); +__RCSID("$NetBSD: hayes.c,v 1.17 2011/09/06 18:33:01 joerg Exp $"); #endif /* not lint */ /* @@ -73,7 +73,7 @@ static void error_rep(char); static char gobble(const char *); static void goodbye(void); static int hay_sync(void); -static void sigALRM(int); +__dead static void sigALRM(int); int /*ARGSUSED*/ diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c index ff6288736ca..dbabe3eee0f 100644 --- a/usr.bin/tip/cmds.c +++ b/usr.bin/tip/cmds.c @@ -1,4 +1,4 @@ -/* $NetBSD: cmds.c,v 1.32 2006/12/14 17:09:43 christos Exp $ */ +/* $NetBSD: cmds.c,v 1.33 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: cmds.c,v 1.32 2006/12/14 17:09:43 christos Exp $"); +__RCSID("$NetBSD: cmds.c,v 1.33 2011/09/06 18:33:01 joerg Exp $"); #endif /* not lint */ #include "tip.h" @@ -55,7 +55,7 @@ static char *argv[10]; /* argument vector for take and put */ int args(char *, char **); int anyof(char *, const char *); void execute(char *); -void intcopy(int); +__dead static void intcopy(int); void prtime(const char *, time_t); void stopsnd(int); void transfer(char *, int, const char *); diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c index 9eab65a5924..bc3dc0f448c 100644 --- a/usr.bin/tip/cu.c +++ b/usr.bin/tip/cu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cu.c,v 1.20 2006/12/14 17:09:43 christos Exp $ */ +/* $NetBSD: cu.c,v 1.21 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -36,13 +36,13 @@ #if 0 static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: cu.c,v 1.20 2006/12/14 17:09:43 christos Exp $"); +__RCSID("$NetBSD: cu.c,v 1.21 2011/09/06 18:33:01 joerg Exp $"); #endif /* not lint */ #include "tip.h" -static void cuhelp(void); -static void cuusage(void); +__dead static void cuhelp(void); +__dead static void cuusage(void); /* * Botch the interface to look like cu's diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c index 2202bd0dc15..d1671c023e7 100644 --- a/usr.bin/tip/hunt.c +++ b/usr.bin/tip/hunt.c @@ -1,4 +1,4 @@ -/* $NetBSD: hunt.c,v 1.17 2011/05/24 12:46:16 joerg Exp $ */ +/* $NetBSD: hunt.c,v 1.18 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)hunt.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: hunt.c,v 1.17 2011/05/24 12:46:16 joerg Exp $"); +__RCSID("$NetBSD: hunt.c,v 1.18 2011/09/06 18:33:01 joerg Exp $"); #endif /* not lint */ #include "tip.h" @@ -42,9 +42,9 @@ __RCSID("$NetBSD: hunt.c,v 1.17 2011/05/24 12:46:16 joerg Exp $"); static jmp_buf deadline; static int deadfl; -void dead(int); +__dead static void dead(int); -void +static void /*ARGSUSED*/ dead(int dummy __unused) { diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c index 8f4689b6410..2c701845cc9 100644 --- a/usr.bin/tip/tip.c +++ b/usr.bin/tip/tip.c @@ -1,4 +1,4 @@ -/* $NetBSD: tip.c,v 1.50 2009/01/18 07:12:39 lukem Exp $ */ +/* $NetBSD: tip.c,v 1.51 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\ #if 0 static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: tip.c,v 1.50 2009/01/18 07:12:39 lukem Exp $"); +__RCSID("$NetBSD: tip.c,v 1.51 2011/09/06 18:33:01 joerg Exp $"); #endif /* not lint */ /* @@ -54,12 +54,12 @@ __RCSID("$NetBSD: tip.c,v 1.50 2009/01/18 07:12:39 lukem Exp $"); #include "tip.h" #include "pathnames.h" -static void tipusage(void); +__dead static void tipusage(void); int escape(void); int main(int, char **); -void intprompt(int); -void tipin(void); +__dead static void intprompt(int); +__dead static void tipin(void); char PNbuf[256]; /* This limits the size of a number */ @@ -320,7 +320,7 @@ prompt(const char *s, char *volatile p, size_t l) /* * Interrupt service routine during prompting */ -void +static void /*ARGSUSED*/ intprompt(int dummy __unused) { @@ -334,7 +334,7 @@ intprompt(int dummy __unused) /* * ****TIPIN TIPIN**** */ -void +static void tipin(void) { char gch, bol = 1; diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h index 2809adc67f5..548008e7498 100644 --- a/usr.bin/tip/tip.h +++ b/usr.bin/tip/tip.h @@ -1,4 +1,4 @@ -/* $NetBSD: tip.h,v 1.31 2010/01/28 14:15:18 mbalmer Exp $ */ +/* $NetBSD: tip.h,v 1.32 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1989, 1993 @@ -264,7 +264,7 @@ extern unsigned char evenpartab[]; void alrmtimeout(int); int any(char, const char *); void chdirectory(char); -void cleanup(int); +void cleanup(int) __dead; const char *tip_connect(void); void consh(char); char *ctrl(char); @@ -273,7 +273,7 @@ void cu_put(char); void cu_take(char); void disconnect(const char *); char *expand(char *); -void finish(char); +void finish(char) __dead; void genbrk(char); void getfl(char); char *getremote(char *); @@ -293,8 +293,8 @@ void setscript(void); void shell(char); void suspend(char); void tandem(const char *); -void tipabort(const char *); -void tipout(void); +void tipabort(const char *) __dead; +void tipout(void) __dead; int ttysetup(speed_t); void unraw(void); void variable(char); diff --git a/usr.bin/tip/tipout.c b/usr.bin/tip/tipout.c index 9113fb07431..be0168298c7 100644 --- a/usr.bin/tip/tipout.c +++ b/usr.bin/tip/tipout.c @@ -1,4 +1,4 @@ -/* $NetBSD: tipout.c,v 1.14 2006/12/14 17:09:43 christos Exp $ */ +/* $NetBSD: tipout.c,v 1.15 2011/09/06 18:33:01 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,7 +35,7 @@ #if 0 static char sccsid[] = "@(#)tipout.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: tipout.c,v 1.14 2006/12/14 17:09:43 christos Exp $"); +__RCSID("$NetBSD: tipout.c,v 1.15 2011/09/06 18:33:01 joerg Exp $"); #endif /* not lint */ #include "tip.h" @@ -49,7 +49,7 @@ __RCSID("$NetBSD: tipout.c,v 1.14 2006/12/14 17:09:43 christos Exp $"); void intEMT(void); void intIOT(void); void intSYS(void); -void intTERM(int); +__dead static void intTERM(int); /* * TIPOUT wait state routine -- @@ -96,7 +96,7 @@ intEMT(void) (void)write(repdes[1], &reply, 1); /* Now coprocess waits for us */ } -void +static void /*ARGSUSED*/ intTERM(int dummy __unused) { -- cgit