From 6e33bec8d49b4b1d0f4e8255e7fb63ca854187fc Mon Sep 17 00:00:00 2001
From: joerg <joerg@NetBSD.org>
Date: Mon, 29 Aug 2011 14:05:08 +0000
Subject: [PATCH] static + __dead

---
 usr.bin/chflags/chflags.c |  8 ++++----
 usr.bin/chpass/chpass.c   | 16 ++++++++--------
 usr.bin/chpass/chpass.h   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c
index 6dd2ed1afad0..6c374cdba36d 100644
--- a/usr.bin/chflags/chflags.c
+++ b/usr.bin/chflags/chflags.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: chflags.c,v 1.15 2008/07/21 14:19:21 lukem Exp $	*/
+/*	$NetBSD: chflags.c,v 1.16 2011/08/29 14:05:08 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
 #if 0
 static char sccsid[] = "from: @(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #else
-__RCSID("$NetBSD: chflags.c,v 1.15 2008/07/21 14:19:21 lukem Exp $");
+__RCSID("$NetBSD: chflags.c,v 1.16 2011/08/29 14:05:08 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -55,7 +55,7 @@ __RCSID("$NetBSD: chflags.c,v 1.15 2008/07/21 14:19:21 lukem Exp $");
 #include <unistd.h>
 #include <util.h>
 
-void	usage(void);
+__dead static void	usage(void);
 
 int
 main(int argc, char *argv[])
@@ -191,7 +191,7 @@ main(int argc, char *argv[])
 	exit(rval);
 }
 
-void
+static void
 usage(void)
 {
 
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index b50f99d8b32e..1993dd6dc404 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: chpass.c,v 1.33 2008/07/21 14:19:21 lukem Exp $	*/
+/*	$NetBSD: chpass.c,v 1.34 2011/08/29 14:08:39 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\
 #if 0
 static char sccsid[] = "@(#)chpass.c	8.4 (Berkeley) 4/2/94";
 #else 
-__RCSID("$NetBSD: chpass.c,v 1.33 2008/07/21 14:19:21 lukem Exp $");
+__RCSID("$NetBSD: chpass.c,v 1.34 2011/08/29 14:08:39 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -73,9 +73,9 @@ void	(*Pw_error)(const char *, int, int);
 extern	int _yp_check(char **);	/* buried deep inside libc */
 #endif
 
-void	baduser(void);
-void	cleanup(void);
-void	usage(void);
+__dead static void	baduser(void);
+static void	cleanup(void);
+__dead static void	usage(void);
 
 int
 main(int argc, char **argv)
@@ -290,14 +290,14 @@ main(int argc, char **argv)
 	exit(0);
 }
 
-void
+static void
 baduser(void)
 {
 
 	errx(1, "%s", strerror(EACCES));
 }
 
-void
+static void
 usage(void)
 {
 
@@ -308,7 +308,7 @@ usage(void)
 	exit(1);
 }
 
-void
+static void
 cleanup(void)
 {
 
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index ea5fa34f854e..c1efa59a6787 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: chpass.h,v 1.12 2005/02/17 17:09:48 xtraeme Exp $	*/
+/*	$NetBSD: chpass.h,v 1.13 2011/08/29 14:08:39 joerg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -72,7 +72,7 @@ int	 verify(char *, struct passwd *);
 #ifdef YP
 int	check_yppasswdd(void);
 int	pw_yp(struct passwd *, uid_t);
-void	yppw_error(const char *name, int, int);
+__dead void	yppw_error(const char *name, int, int);
 void	yppw_prompt(void);
 struct passwd *ypgetpwnam(const char *);
 struct passwd *ypgetpwuid(uid_t);