Module Name: src
Committed By: joerg
Date: Tue Sep 6 18:33:01 UTC 2011
Modified Files:
src/usr.bin/tip: acu.c cmds.c cu.c hunt.c tip.c tip.h tipout.c
src/usr.bin/tip/aculib: hayes.c
Log Message:
Use __dead. Make a bunch of local functions static.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/tip/acu.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/tip/cmds.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/tip/cu.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/tip/hunt.c
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/tip/tip.c
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/tip/tip.h
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/tip/tipout.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/tip/aculib/hayes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tip/acu.c
diff -u src/usr.bin/tip/acu.c:1.15 src/usr.bin/tip/acu.c:1.16
--- src/usr.bin/tip/acu.c:1.15 Thu Dec 14 17:09:43 2006
+++ src/usr.bin/tip/acu.c Tue Sep 6 18:33:01 2011
@@ -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 int conflag;
static jmp_buf jmpbuf;
-static void acuabort(int);
+__dead static void acuabort(int);
static acu_t *acutype(char *);
/*
Index: src/usr.bin/tip/cmds.c
diff -u src/usr.bin/tip/cmds.c:1.32 src/usr.bin/tip/cmds.c:1.33
--- src/usr.bin/tip/cmds.c:1.32 Thu Dec 14 17:09:43 2006
+++ src/usr.bin/tip/cmds.c Tue Sep 6 18:33:01 2011
@@ -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 @@
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 *);
Index: src/usr.bin/tip/cu.c
diff -u src/usr.bin/tip/cu.c:1.20 src/usr.bin/tip/cu.c:1.21
--- src/usr.bin/tip/cu.c:1.20 Thu Dec 14 17:09:43 2006
+++ src/usr.bin/tip/cu.c Tue Sep 6 18:33:01 2011
@@ -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
Index: src/usr.bin/tip/hunt.c
diff -u src/usr.bin/tip/hunt.c:1.17 src/usr.bin/tip/hunt.c:1.18
--- src/usr.bin/tip/hunt.c:1.17 Tue May 24 12:46:16 2011
+++ src/usr.bin/tip/hunt.c Tue Sep 6 18:33:01 2011
@@ -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 @@
static jmp_buf deadline;
static int deadfl;
-void dead(int);
+__dead static void dead(int);
-void
+static void
/*ARGSUSED*/
dead(int dummy __unused)
{
Index: src/usr.bin/tip/tip.c
diff -u src/usr.bin/tip/tip.c:1.50 src/usr.bin/tip/tip.c:1.51
--- src/usr.bin/tip/tip.c:1.50 Sun Jan 18 07:12:39 2009
+++ src/usr.bin/tip/tip.c Tue Sep 6 18:33:01 2011
@@ -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 @@
#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 @@
#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 @@
/*
* Interrupt service routine during prompting
*/
-void
+static void
/*ARGSUSED*/
intprompt(int dummy __unused)
{
@@ -334,7 +334,7 @@
/*
* ****TIPIN TIPIN****
*/
-void
+static void
tipin(void)
{
char gch, bol = 1;
Index: src/usr.bin/tip/tip.h
diff -u src/usr.bin/tip/tip.h:1.31 src/usr.bin/tip/tip.h:1.32
--- src/usr.bin/tip/tip.h:1.31 Thu Jan 28 14:15:18 2010
+++ src/usr.bin/tip/tip.h Tue Sep 6 18:33:01 2011
@@ -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 @@
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_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 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);
Index: src/usr.bin/tip/tipout.c
diff -u src/usr.bin/tip/tipout.c:1.14 src/usr.bin/tip/tipout.c:1.15
--- src/usr.bin/tip/tipout.c:1.14 Thu Dec 14 17:09:43 2006
+++ src/usr.bin/tip/tipout.c Tue Sep 6 18:33:01 2011
@@ -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 @@
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 @@
(void)write(repdes[1], &reply, 1); /* Now coprocess waits for us */
}
-void
+static void
/*ARGSUSED*/
intTERM(int dummy __unused)
{
Index: src/usr.bin/tip/aculib/hayes.c
diff -u src/usr.bin/tip/aculib/hayes.c:1.16 src/usr.bin/tip/aculib/hayes.c:1.17
--- src/usr.bin/tip/aculib/hayes.c:1.16 Sun Jan 18 07:12:39 2009
+++ src/usr.bin/tip/aculib/hayes.c Tue Sep 6 18:33:01 2011
@@ -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 char gobble(const char *);
static void goodbye(void);
static int hay_sync(void);
-static void sigALRM(int);
+__dead static void sigALRM(int);
int
/*ARGSUSED*/
