diff options
| author | joerg <joerg@NetBSD.org> | 2011-08-29 20:41:06 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2011-08-29 20:41:06 +0000 |
| commit | d20055767f8f5becbc26e71c65c418b9b6def96d (patch) | |
| tree | 16268d21aee0054b1edbb36027edd5350c155aad /libexec | |
| parent | d6c1d36cbf2ccf30c8ca2802f26610e5eaa26427 (diff) | |
Use __dead
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/extern.h | 6 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 10 | ||||
| -rw-r--r-- | libexec/getNAME/getNAME.c | 6 | ||||
| -rw-r--r-- | libexec/identd/identd.c | 10 | ||||
| -rw-r--r-- | libexec/rpc.rstatd/rstatd.c | 9 | ||||
| -rw-r--r-- | libexec/rpc.rwalld/rwalld.c | 8 | ||||
| -rw-r--r-- | libexec/rpc.sprayd/sprayd.c | 10 | ||||
| -rw-r--r-- | libexec/tftpd/tftpd.c | 12 |
8 files changed, 33 insertions, 38 deletions
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h index 254f1834ad6..e5266d719ea 100644 --- a/libexec/ftpd/extern.h +++ b/libexec/ftpd/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.61 2009/07/13 19:05:40 roy Exp $ */ +/* $NetBSD: extern.h,v 1.62 2011/08/29 20:41:06 joerg Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -124,8 +124,8 @@ FILE *dataconn(const char *, off_t, const char *); void delete(const char *); int display_file(const char *, int); const char **do_conversion(const char *); -void dologout(int); -void fatal(const char *); +__dead void dologout(int); +__dead void fatal(const char *); void feat(void); void format_path(char *, const char *); int ftpd_pclose(FILE *); diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 9281385ed4a..dfb2fa1df3a 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.194 2009/07/13 19:05:40 roy Exp $ */ +/* $NetBSD: ftpd.c,v 1.195 2011/08/29 20:41:06 joerg Exp $ */ /* * Copyright (c) 1997-2009 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994\ #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.194 2009/07/13 19:05:40 roy Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.195 2011/08/29 20:41:06 joerg Exp $"); #endif #endif /* not lint */ @@ -249,9 +249,9 @@ static char *gunique(const char *); static void login_utmp(const char *, const char *, const char *, struct sockinet *); static void logremotehost(struct sockinet *); -static void lostconn(int); -static void toolong(int); -static void sigquit(int); +__dead static void lostconn(int); +__dead static void toolong(int); +__dead static void sigquit(int); static void sigurg(int); static int handleoobcmd(void); static int receive_data(FILE *, FILE *); diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c index dbfb9f44d65..590fa48aa5e 100644 --- a/libexec/getNAME/getNAME.c +++ b/libexec/getNAME/getNAME.c @@ -1,4 +1,4 @@ -/* $NetBSD: getNAME.c,v 1.26 2008/07/20 01:09:07 lukem Exp $ */ +/* $NetBSD: getNAME.c,v 1.27 2011/08/29 20:41:06 joerg Exp $ */ /*- * Copyright (c) 1997, Christos Zoulas. All rights reserved. @@ -37,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\ #if 0 static char sccsid[] = "@(#)getNAME.c 8.1 (Berkeley) 6/30/93"; #else -__RCSID("$NetBSD: getNAME.c,v 1.26 2008/07/20 01:09:07 lukem Exp $"); +__RCSID("$NetBSD: getNAME.c,v 1.27 2011/08/29 20:41:06 joerg Exp $"); #endif #endif /* not lint */ @@ -76,7 +76,7 @@ static void remcomma(char *, size_t *); static void remquote(char *, size_t *); static void fixxref(char *, size_t *); static void split(char *, char *); -static void usage(void); +__dead static void usage(void); int main(int, char *[]); diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c index baa8a0594f6..a44e8bd908b 100644 --- a/libexec/identd/identd.c +++ b/libexec/identd/identd.c @@ -1,4 +1,4 @@ -/* $NetBSD: identd.c,v 1.32 2009/01/18 00:37:53 lukem Exp $ */ +/* $NetBSD: identd.c,v 1.33 2011/08/29 20:41:06 joerg Exp $ */ /* * identd.c - TCP/IP Ident protocol server. @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: identd.c,v 1.32 2009/01/18 00:37:53 lukem Exp $"); +__RCSID("$NetBSD: identd.c,v 1.33 2011/08/29 20:41:06 joerg Exp $"); #include <sys/param.h> #include <sys/socket.h> @@ -61,9 +61,9 @@ static int check_noident(const char *); static int check_userident(const char *, char *, size_t); static void random_string(char *, size_t); static int change_format(const char *, struct passwd *, char *, size_t); -static void timeout_handler(int); -static void fatal(const char *); -static void die(const char *, ...); +__dead static void timeout_handler(int); +__dead static void fatal(const char *); +__dead static void die(const char *, ...); static int bflag, eflag, fflag, iflag, Iflag; static int lflag, Lflag, nflag, Nflag, rflag; diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index ab539693f0c..aefb841cfb5 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rstatd.c,v 1.14 2006/05/09 20:18:07 mrg Exp $ */ +/* $NetBSD: rstatd.c,v 1.15 2011/08/29 20:41:06 joerg Exp $ */ /*- * Copyright (c) 1993, John Brezak @@ -35,7 +35,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: rstatd.c,v 1.14 2006/05/09 20:18:07 mrg Exp $"); +__RCSID("$NetBSD: rstatd.c,v 1.15 2011/08/29 20:41:06 joerg Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -50,13 +50,12 @@ __RCSID("$NetBSD: rstatd.c,v 1.14 2006/05/09 20:18:07 mrg Exp $"); #include <rpcsvc/rstat.h> extern void rstat_service(struct svc_req *, SVCXPRT *); -void cleanup(int); -int main(int, char *[]); +__dead static void cleanup(int); int from_inetd = 1; /* started from inetd ? */ int closedown = 20; /* how long to wait before going dormant */ -void +static void cleanup(int dummy) { (void) rpcb_unset(RSTATPROG, RSTATVERS_TIME, NULL); diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c index 3a91eb356db..ff0ea514b38 100644 --- a/libexec/rpc.rwalld/rwalld.c +++ b/libexec/rpc.rwalld/rwalld.c @@ -1,4 +1,4 @@ -/* $NetBSD: rwalld.c,v 1.20 2006/05/09 20:18:07 mrg Exp $ */ +/* $NetBSD: rwalld.c,v 1.21 2011/08/29 20:41:06 joerg Exp $ */ /* * Copyright (c) 1993 Christopher G. Demetriou @@ -36,7 +36,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: rwalld.c,v 1.20 2006/05/09 20:18:07 mrg Exp $"); +__RCSID("$NetBSD: rwalld.c,v 1.21 2011/08/29 20:41:06 joerg Exp $"); #endif /* not lint */ #include <unistd.h> @@ -64,9 +64,7 @@ static int from_inetd = 1; static void cleanup(int); static void wallprog_1(struct svc_req *, SVCXPRT *); -int main(int, char *[]); - -static void +__dead static void cleanup(int n) { diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index e027c19a658..765ea52f1c3 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $ */ +/* $NetBSD: sprayd.c,v 1.16 2011/08/29 20:41:06 joerg Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $"); +__RCSID("$NetBSD: sprayd.c,v 1.16 2011/08/29 20:41:06 joerg Exp $"); #endif /* not lint */ #include <stdio.h> @@ -40,12 +40,10 @@ __RCSID("$NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $"); #include <rpc/rpc.h> #include <rpcsvc/spray.h> -static void cleanup(int); -static void die(int); +__dead static void cleanup(int); +__dead static void die(int); static void spray_service(struct svc_req *, SVCXPRT *); -int main(int, char *[]); - static int from_inetd = 1; #define TIMEOUT 120 diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 3e6b000a4cf..b23a9ddf2e8 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: tftpd.c,v 1.38 2010/04/29 20:13:46 hubertf Exp $ */ +/* $NetBSD: tftpd.c,v 1.39 2011/08/29 20:41:07 joerg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\ #if 0 static char sccsid[] = "@(#)tftpd.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: tftpd.c,v 1.38 2010/04/29 20:13:46 hubertf Exp $"); +__RCSID("$NetBSD: tftpd.c,v 1.39 2011/08/29 20:41:07 joerg Exp $"); #endif #endif /* not lint */ @@ -115,13 +115,13 @@ struct formats; static const char *errtomsg(int); static void nak(int); -static void tftp(struct tftphdr *, int); -static void usage(void) __attribute__((__noreturn__)); +__dead static void tftp(struct tftphdr *, int); +__dead static void usage(void); static char *verifyhost(struct sockaddr *); -static void justquit(int); +__dead static void justquit(int); static void recvfile(struct formats *, int, int); static void sendfile(struct formats *, int, int); -static void timer(int); +__dead static void timer(int); static const char *opcode(int); static int validate_access(char **, int); |
