Module Name: src
Committed By: joerg
Date: Mon Aug 29 14:51:19 UTC 2011
Modified Files:
src/bin/chio: chio.c
src/bin/chmod: chmod.c
src/bin/csh: csh.c dol.c extern.h sem.c
src/bin/dd: extern.h
src/bin/domainname: domainname.c
src/bin/ed: ed.h
src/bin/hostname: hostname.c
src/bin/kill: kill.c
src/bin/ps: ps.c
src/bin/pwd: pwd.c
src/bin/sleep: sleep.c
src/bin/stty: extern.h gfmt.c
src/bin/test: test.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/bin/chio/chio.c
cvs rdiff -u -r1.35 -r1.36 src/bin/chmod/chmod.c
cvs rdiff -u -r1.41 -r1.42 src/bin/csh/csh.c
cvs rdiff -u -r1.26 -r1.27 src/bin/csh/dol.c
cvs rdiff -u -r1.22 -r1.23 src/bin/csh/extern.h
cvs rdiff -u -r1.28 -r1.29 src/bin/csh/sem.c
cvs rdiff -u -r1.18 -r1.19 src/bin/dd/extern.h
cvs rdiff -u -r1.14 -r1.15 src/bin/domainname/domainname.c
cvs rdiff -u -r1.34 -r1.35 src/bin/ed/ed.h
cvs rdiff -u -r1.16 -r1.17 src/bin/hostname/hostname.c
cvs rdiff -u -r1.26 -r1.27 src/bin/kill/kill.c
cvs rdiff -u -r1.75 -r1.76 src/bin/ps/ps.c
cvs rdiff -u -r1.21 -r1.22 src/bin/pwd/pwd.c
cvs rdiff -u -r1.23 -r1.24 src/bin/sleep/sleep.c
cvs rdiff -u -r1.11 -r1.12 src/bin/stty/extern.h
cvs rdiff -u -r1.16 -r1.17 src/bin/stty/gfmt.c
cvs rdiff -u -r1.37 -r1.38 src/bin/test/test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/chio/chio.c
diff -u src/bin/chio/chio.c:1.30 src/bin/chio/chio.c:1.31
--- src/bin/chio/chio.c:1.30 Sun Jul 20 00:52:39 2008
+++ src/bin/chio/chio.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chio.c,v 1.30 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: chio.c,v 1.31 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1996, 1998, 1999 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
__COPYRIGHT(
"@(#) Copyright (c) 1996, 1998, 1999\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: chio.c,v 1.30 2008/07/20 00:52:39 lukem Exp $");
+__RCSID("$NetBSD: chio.c,v 1.31 2011/08/29 14:51:17 joerg Exp $");
#endif
#include <sys/param.h>
@@ -61,7 +61,7 @@
#include "pathnames.h"
int main(int, char *[]);
-static void usage(void);
+__dead static void usage(void);
static void cleanup(void);
static int parse_element_type(const char *);
static int parse_element_unit(const char *);
Index: src/bin/chmod/chmod.c
diff -u src/bin/chmod/chmod.c:1.35 src/bin/chmod/chmod.c:1.36
--- src/bin/chmod/chmod.c:1.35 Fri Jan 22 05:41:36 2010
+++ src/bin/chmod/chmod.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chmod.c,v 1.35 2010/01/22 05:41:36 snj Exp $ */
+/* $NetBSD: chmod.c,v 1.36 2011/08/29 14:51:17 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
#else
-__RCSID("$NetBSD: chmod.c,v 1.35 2010/01/22 05:41:36 snj Exp $");
+__RCSID("$NetBSD: chmod.c,v 1.36 2011/08/29 14:51:17 joerg Exp $");
#endif
#endif /* not lint */
@@ -58,8 +58,7 @@
#include <string.h>
#include <unistd.h>
-int main(int, char *[]);
-void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -203,7 +202,7 @@
/* NOTREACHED */
}
-void
+static void
usage(void)
{
(void)fprintf(stderr,
Index: src/bin/csh/csh.c
diff -u src/bin/csh/csh.c:1.41 src/bin/csh/csh.c:1.42
--- src/bin/csh/csh.c:1.41 Sun Jul 20 00:52:39 2008
+++ src/bin/csh/csh.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.c,v 1.41 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: csh.c,v 1.42 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-__RCSID("$NetBSD: csh.c,v 1.41 2008/07/20 00:52:39 lukem Exp $");
+__RCSID("$NetBSD: csh.c,v 1.42 2011/08/29 14:51:17 joerg Exp $");
#endif
#endif /* not lint */
@@ -99,7 +99,7 @@
static int closef(void *);
static int srccat(Char *, Char *);
static int srcfile(const char *, int, int);
-static void phup(int);
+__dead static void phup(int);
static void srcunit(int, int, int);
static void mailchk(void);
#ifndef _PATH_DEFPATH
Index: src/bin/csh/dol.c
diff -u src/bin/csh/dol.c:1.26 src/bin/csh/dol.c:1.27
--- src/bin/csh/dol.c:1.26 Mon Jul 16 18:26:09 2007
+++ src/bin/csh/dol.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dol.c,v 1.26 2007/07/16 18:26:09 christos Exp $ */
+/* $NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dol.c,v 1.26 2007/07/16 18:26:09 christos Exp $");
+__RCSID("$NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $");
#endif
#endif /* not lint */
@@ -85,7 +85,7 @@
static void Dfix2(Char **);
static Char *Dpack(Char *, Char *);
static int Dword(void);
-static void dolerror(Char *);
+__dead static void dolerror(Char *);
static int DgetC(int);
static void Dgetdol(void);
static void fixDolMod(void);
Index: src/bin/csh/extern.h
diff -u src/bin/csh/extern.h:1.22 src/bin/csh/extern.h:1.23
--- src/bin/csh/extern.h:1.22 Mon Dec 24 16:11:50 2007
+++ src/bin/csh/extern.h Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.22 2007/12/24 16:11:50 perry Exp $ */
+/* $NetBSD: extern.h,v 1.23 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,10 +42,10 @@
int gethdir(Char *);
void dosource(Char **, struct command *);
__dead void exitstat(void);
-void goodbye(void);
+__dead void goodbye(void);
void importpath(Char *);
void initdesc(void);
-void pintr(int);
+__dead void pintr(int);
__dead void pintr1(int);
void printprompt(void);
void process(int);
@@ -128,8 +128,8 @@
void dogoto(Char **, struct command *);
void doif(Char **, struct command *);
void dolimit(Char **, struct command *);
-void dologin(Char **, struct command *);
-void dologout(Char **, struct command *);
+__dead void dologin(Char **, struct command *);
+__dead void dologout(Char **, struct command *);
void donohup(Char **, struct command *);
void doonintr(Char **, struct command *);
void doprintf(Char **, struct command *);
Index: src/bin/csh/sem.c
diff -u src/bin/csh/sem.c:1.28 src/bin/csh/sem.c:1.29
--- src/bin/csh/sem.c:1.28 Mon Jul 16 18:26:10 2007
+++ src/bin/csh/sem.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.28 2007/07/16 18:26:10 christos Exp $ */
+/* $NetBSD: sem.c,v 1.29 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: sem.c,v 1.28 2007/07/16 18:26:10 christos Exp $");
+__RCSID("$NetBSD: sem.c,v 1.29 2011/08/29 14:51:17 joerg Exp $");
#endif
#endif /* not lint */
@@ -53,7 +53,7 @@
#include "extern.h"
#include "proc.h"
-static void vffree(int);
+__dead static void vffree(int);
static Char *splicepipe(struct command *t, Char *);
static void doio(struct command *t, int *, int *);
static void chkclob(char *);
Index: src/bin/dd/extern.h
diff -u src/bin/dd/extern.h:1.18 src/bin/dd/extern.h:1.19
--- src/bin/dd/extern.h:1.18 Mon Nov 22 21:04:28 2010
+++ src/bin/dd/extern.h Mon Aug 29 14:51:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.18 2010/11/22 21:04:28 pooka Exp $ */
+/* $NetBSD: extern.h,v 1.19 2011/08/29 14:51:18 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -47,7 +47,7 @@
void pos_out(void);
void summary(void);
void summaryx(int);
-void terminate(int);
+__dead void terminate(int);
void unblock(void);
void unblock_close(void);
ssize_t bwrite(IO *, const void *, size_t);
Index: src/bin/domainname/domainname.c
diff -u src/bin/domainname/domainname.c:1.14 src/bin/domainname/domainname.c:1.15
--- src/bin/domainname/domainname.c:1.14 Sun Jul 20 00:52:39 2008
+++ src/bin/domainname/domainname.c Mon Aug 29 14:51:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: domainname.c,v 1.14 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: domainname.c,v 1.15 2011/08/29 14:51:18 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: domainname.c,v 1.14 2008/07/20 00:52:39 lukem Exp $");
+__RCSID("$NetBSD: domainname.c,v 1.15 2011/08/29 14:51:18 joerg Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,7 @@
#include <string.h>
#include <unistd.h>
-static void usage(void);
-int main(int, char *[]);
+__dead static void usage(void);
int
main(int argc, char *argv[])
Index: src/bin/ed/ed.h
diff -u src/bin/ed/ed.h:1.34 src/bin/ed/ed.h:1.35
--- src/bin/ed/ed.h:1.34 Sun Jul 26 02:06:37 2009
+++ src/bin/ed/ed.h Mon Aug 29 14:51:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ed.h,v 1.34 2009/07/26 02:06:37 dholland Exp $ */
+/* $NetBSD: ed.h,v 1.35 2011/08/29 14:51:18 joerg Exp $ */
/* ed.h: type and constant definitions for the ed editor. */
/*
@@ -223,8 +223,8 @@
int get_shell_command(void);
int get_stream_line(FILE *);
int get_tty_line(void);
-void handle_hup(int);
-void handle_int(int);
+__dead void handle_hup(int);
+__dead void handle_int(int);
void handle_winch(int);
int has_trailing_escape(char *, char *);
void init_buffers(void);
@@ -243,7 +243,7 @@
char *put_sbuf_line(char *);
int put_stream_line(FILE *, char *, int);
int put_tty_line(char *, int, long, int);
-void quit(int);
+__dead void quit(int);
long read_file(char *, long);
long read_stream(FILE *, long);
int search_and_replace(pattern_t *, int, int);
Index: src/bin/hostname/hostname.c
diff -u src/bin/hostname/hostname.c:1.16 src/bin/hostname/hostname.c:1.17
--- src/bin/hostname/hostname.c:1.16 Sun Jul 20 00:52:39 2008
+++ src/bin/hostname/hostname.c Mon Aug 29 14:51:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hostname.c,v 1.16 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: hostname.c,v 1.17 2011/08/29 14:51:18 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)hostname.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: hostname.c,v 1.16 2008/07/20 00:52:39 lukem Exp $");
+__RCSID("$NetBSD: hostname.c,v 1.17 2011/08/29 14:51:18 joerg Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,7 @@
#include <string.h>
#include <unistd.h>
-void usage(void);
-int main(int, char *[]);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -92,7 +91,7 @@
/* NOTREACHED */
}
-void
+static void
usage(void)
{
(void)fprintf(stderr, "usage: %s [-s] [name-of-host]\n",
Index: src/bin/kill/kill.c
diff -u src/bin/kill/kill.c:1.26 src/bin/kill/kill.c:1.27
--- src/bin/kill/kill.c:1.26 Thu Oct 1 09:24:38 2009
+++ src/bin/kill/kill.c Mon Aug 29 14:51:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kill.c,v 1.26 2009/10/01 09:24:38 spz Exp $ */
+/* $NetBSD: kill.c,v 1.27 2011/08/29 14:51:18 joerg Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kill.c,v 1.26 2009/10/01 09:24:38 spz Exp $");
+__RCSID("$NetBSD: kill.c,v 1.27 2011/08/29 14:51:18 joerg Exp $");
#endif
#endif /* not lint */
@@ -58,15 +58,15 @@
#include <sys/ioctl.h>
#ifdef SHELL /* sh (aka ash) builtin */
+int killcmd(int, char *argv[]);
#define main killcmd
#include "../../bin/sh/bltin/bltin.h"
#endif /* SHELL */
-static void nosig(char *);
+__dead static void nosig(char *);
static void printsignals(FILE *);
static int signame_to_signum(char *);
-static void usage(void);
-int main(int, char *[]);
+__dead static void usage(void);
int
main(int argc, char *argv[])
Index: src/bin/ps/ps.c
diff -u src/bin/ps/ps.c:1.75 src/bin/ps/ps.c:1.76
--- src/bin/ps/ps.c:1.75 Mon May 31 03:18:33 2010
+++ src/bin/ps/ps.c Mon Aug 29 14:51:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ps.c,v 1.75 2010/05/31 03:18:33 rmind Exp $ */
+/* $NetBSD: ps.c,v 1.76 2011/08/29 14:51:18 joerg Exp $ */
/*
* Copyright (c) 2000-2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: ps.c,v 1.75 2010/05/31 03:18:33 rmind Exp $");
+__RCSID("$NetBSD: ps.c,v 1.76 2011/08/29 14:51:18 joerg Exp $");
#endif
#endif /* not lint */
@@ -128,7 +128,7 @@
static char *kludge_oldps_options(char *);
static int pscomp(const void *, const void *);
static void scanvars(void);
-static void usage(void);
+__dead static void usage(void);
static int parsenum(const char *, const char *);
int main(int, char *[]);
Index: src/bin/pwd/pwd.c
diff -u src/bin/pwd/pwd.c:1.21 src/bin/pwd/pwd.c:1.22
--- src/bin/pwd/pwd.c:1.21 Sun Jul 20 00:52:40 2008
+++ src/bin/pwd/pwd.c Mon Aug 29 14:51:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pwd.c,v 1.21 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: pwd.c,v 1.22 2011/08/29 14:51:19 joerg Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94";
#else
-__RCSID("$NetBSD: pwd.c,v 1.21 2008/07/20 00:52:40 lukem Exp $");
+__RCSID("$NetBSD: pwd.c,v 1.22 2011/08/29 14:51:19 joerg Exp $");
#endif
#endif /* not lint */
@@ -56,7 +56,7 @@
#include <unistd.h>
static char *getcwd_logical(void);
-static void usage(void);
+__dead static void usage(void);
/*
* Note that EEE Std 1003.1, 2003 requires that the default be -L.
Index: src/bin/sleep/sleep.c
diff -u src/bin/sleep/sleep.c:1.23 src/bin/sleep/sleep.c:1.24
--- src/bin/sleep/sleep.c:1.23 Sat Oct 9 04:57:30 2010
+++ src/bin/sleep/sleep.c Mon Aug 29 14:51:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sleep.c,v 1.23 2010/10/09 04:57:30 mrg Exp $ */
+/* $NetBSD: sleep.c,v 1.24 2011/08/29 14:51:19 joerg Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: sleep.c,v 1.23 2010/10/09 04:57:30 mrg Exp $");
+__RCSID("$NetBSD: sleep.c,v 1.24 2011/08/29 14:51:19 joerg Exp $");
#endif
#endif /* not lint */
@@ -53,9 +53,8 @@
#include <time.h>
#include <unistd.h>
-static void alarmhandle(int);
-static void usage(void);
-int main(int, char *[]);
+__dead static void alarmhandle(int);
+__dead static void usage(void);
static volatile sig_atomic_t report_requested;
static void
@@ -65,7 +64,6 @@
report_requested = 1;
}
-
int
main(int argc, char *argv[])
{
@@ -144,7 +142,7 @@
/* NOTREACHED */
}
-void
+static void
usage(void)
{
(void)fprintf(stderr, "usage: %s seconds\n", getprogname());
@@ -153,7 +151,7 @@
}
/* ARGSUSED */
-void
+static void
alarmhandle(int i)
{
_exit(EXIT_SUCCESS);
Index: src/bin/stty/extern.h
diff -u src/bin/stty/extern.h:1.11 src/bin/stty/extern.h:1.12
--- src/bin/stty/extern.h:1.11 Thu Aug 7 09:05:41 2003
+++ src/bin/stty/extern.h Mon Aug 29 14:51:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.11 2003/08/07 09:05:41 agc Exp $ */
+/* $NetBSD: extern.h,v 1.12 2011/08/29 14:51:19 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -44,7 +44,7 @@
int msearch(char ***, struct info *);
void optlist(void);
void print(struct termios *, struct winsize *, int, enum FMT);
-void usage(void);
+__dead void usage(void);
extern const struct cchar cchars1[], cchars2[];
Index: src/bin/stty/gfmt.c
diff -u src/bin/stty/gfmt.c:1.16 src/bin/stty/gfmt.c:1.17
--- src/bin/stty/gfmt.c:1.16 Thu Aug 7 09:05:41 2003
+++ src/bin/stty/gfmt.c Mon Aug 29 14:51:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gfmt.c,v 1.16 2003/08/07 09:05:41 agc Exp $ */
+/* $NetBSD: gfmt.c,v 1.17 2011/08/29 14:51:19 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)gfmt.c 8.6 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: gfmt.c,v 1.16 2003/08/07 09:05:41 agc Exp $");
+__RCSID("$NetBSD: gfmt.c,v 1.17 2011/08/29 14:51:19 joerg Exp $");
#endif
#endif /* not lint */
@@ -47,7 +47,7 @@
#include "stty.h"
#include "extern.h"
-static void gerr(char *);
+__dead static void gerr(char *);
static void
gerr(char *s)
Index: src/bin/test/test.c
diff -u src/bin/test/test.c:1.37 src/bin/test/test.c:1.38
--- src/bin/test/test.c:1.37 Wed Sep 10 19:00:51 2008
+++ src/bin/test/test.c Mon Aug 29 14:51:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: test.c,v 1.37 2008/09/10 19:00:51 christos Exp $ */
+/* $NetBSD: test.c,v 1.38 2011/08/29 14:51:19 joerg Exp $ */
/*
* test(1); version 7-like -- author Erik Baalbergen
@@ -12,7 +12,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: test.c,v 1.37 2008/09/10 19:00:51 christos Exp $");
+__RCSID("$NetBSD: test.c,v 1.38 2011/08/29 14:51:19 joerg Exp $");
#endif
#include <sys/stat.h>
@@ -156,7 +156,7 @@
static char **t_wp;
static struct t_op const *t_wp_op;
-static void syntax(const char *, const char *);
+__dead static void syntax(const char *, const char *);
static int oexpr(enum token);
static int aexpr(enum token);
static int nexpr(enum token);
