Module Name: src
Committed By: joerg
Date: Tue Jan 10 23:39:11 UTC 2012
Modified Files:
src/libexec/telnetd: ext.h telnetd.c
src/usr.bin/telnet: externs.h
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/libexec/telnetd/ext.h
cvs rdiff -u -r1.53 -r1.54 src/libexec/telnetd/telnetd.c
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/telnet/externs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/ext.h
diff -u src/libexec/telnetd/ext.h:1.21 src/libexec/telnetd/ext.h:1.22
--- src/libexec/telnetd/ext.h:1.21 Mon Jan 9 16:36:48 2012
+++ src/libexec/telnetd/ext.h Tue Jan 10 23:39:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext.h,v 1.21 2012/01/09 16:36:48 christos Exp $ */
+/* $NetBSD: ext.h,v 1.22 2012/01/10 23:39:11 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -81,7 +81,7 @@ extern void
add_slc(char, char, cc_t),
check_slc(void),
change_slc(int, int, cc_t),
- cleanup(int),
+ cleanup(int) __dead,
clientstat(int, int, int),
copy_termbuf(char *, int),
deferslc(void),
@@ -91,8 +91,8 @@ extern void
dooption(int),
dontoption(int),
edithost(const char *, const char *),
- fatal(int, const char *),
- fatalperror(int, const char *),
+ fatal(int, const char *) __dead,
+ fatalperror(int, const char *) __dead,
get_slc_defaults(void),
init_env(void),
init_termbuf(void),
@@ -120,7 +120,7 @@ extern void
sendbrk(void),
sendsusp(void),
set_termbuf(void),
- start_login(char *, int, char *),
+ start_login(char *, int, char *) __dead,
start_slc(int),
startslave(char *, int, char *),
suboption(void),
Index: src/libexec/telnetd/telnetd.c
diff -u src/libexec/telnetd/telnetd.c:1.53 src/libexec/telnetd/telnetd.c:1.54
--- src/libexec/telnetd/telnetd.c:1.53 Mon Jan 9 16:36:48 2012
+++ src/libexec/telnetd/telnetd.c Tue Jan 10 23:39:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: telnetd.c,v 1.53 2012/01/09 16:36:48 christos Exp $ */
+/* $NetBSD: telnetd.c,v 1.54 2012/01/10 23:39:11 joerg Exp $ */
/*
* Copyright (C) 1997 and 1998 WIDE Project.
@@ -65,7 +65,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: telnetd.c,v 1.53 2012/01/09 16:36:48 christos Exp $");
+__RCSID("$NetBSD: telnetd.c,v 1.54 2012/01/10 23:39:11 joerg Exp $");
#endif
#endif /* not lint */
@@ -121,11 +121,10 @@ int keepalive = 1;
const char *gettyname = "default";
char *progname;
-int main(int, char *[]);
-void usage(void);
+void usage(void) __dead;
int getterminaltype(char *, size_t);
int getent(char *, const char *);
-void doit(struct sockaddr *);
+static void doit(struct sockaddr *) __dead;
void _gettermname(void);
int terminaltypeok(char *);
char *getstr(const char *, char **);
@@ -670,12 +669,12 @@ char *hostname;
char host_name[MAXHOSTNAMELEN + 1];
char remote_host_name[MAXHOSTNAMELEN + 1];
-extern void telnet(int, int);
+static void telnet(int, int) __dead;
/*
* Get a pty, scan input lines.
*/
-void
+static void
doit(struct sockaddr *who)
{
char *host;
@@ -739,7 +738,7 @@ doit(struct sockaddr *who)
* Main loop. Select from pty and network, and
* hand data to telnet receiver finite state machine.
*/
-void
+static void
telnet(int f, int p)
{
int on = 1;
Index: src/usr.bin/telnet/externs.h
diff -u src/usr.bin/telnet/externs.h:1.36 src/usr.bin/telnet/externs.h:1.37
--- src/usr.bin/telnet/externs.h:1.36 Mon Jan 9 16:08:55 2012
+++ src/usr.bin/telnet/externs.h Tue Jan 10 23:39:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.36 2012/01/09 16:08:55 christos Exp $ */
+/* $NetBSD: externs.h,v 1.37 2012/01/10 23:39:11 joerg Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -234,7 +234,7 @@ int sourceroute(struct addrinfo *, char
/* main.c */
void tninit(void);
-void usage(void);
+void usage(void) __dead;
/* network.c */
void init_network(void);
