 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #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 */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
 @@ -63,29 +63,29 @@ __RCSID("$NetBSD: chpass.c,v 1.33 2008/0
 #include "chpass.h"
 #include "pathnames.h"
 static char tempname[] = "/tmp/pw.XXXXXX";
 uid_t uid;
 int use_yp;
 void	(*Pw_error)(const char *, int, int);
 #ifdef	YP
 extern	int _yp_check(char **);	/* buried deep inside libc */
 #endif
-void	baduser(void);
+__dead static void	baduser(void);
-void	cleanup(void);
+static void	cleanup(void);
-void	usage(void);
+__dead static void	usage(void);
 int
 main(int argc, char **argv)
+{
 	enum { NEWSH, LOADENTRY, EDITENTRY } op;
 	struct passwd *pw, lpw, old_pw;
 	int ch, dfd, pfd, tfd;
 #ifdef YP
 	int yflag = 0;
 #endif
 	char *arg, *username = NULL;
 #ifdef __GNUC__
 @@ -280,37 +280,37 @@ main(int argc, char **argv)
 	/* Copy the passwd file to the lock file, updating pw. */
 	pw_copy(pfd, tfd, pw, (op == LOADENTRY) ? NULL : &old_pw);
 	close(pfd);
 	close(tfd);
 	/* Now finish the passwd file update. */
 	if (pw_mkdb(username, 0) < 0)
 		pw_error(NULL, 0, 1);
 	exit(0);
+}
-void
+static void
 baduser(void)
+{
 	errx(1, "%s", strerror(EACCES));
+}
-void
+static void
 usage(void)
+{
 	(void)fprintf(stderr,
 	    "usage: %s [-a list] [-s shell] [-l] [user]\n"
 	    "       %s [-a list] [-s shell] [-y] [user]\n",
 	    getprogname(), getprogname());
 	exit(1);
+}
-void
+static void
 cleanup(void)
+{
 	(void)unlink(tempname);
+}

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -62,20 +62,20 @@ int	 p_expire(const char *, struct passw
 int	 p_gecos(const char *, struct passwd *, ENTRY *);
 int	 p_gid(const char *, struct passwd *, ENTRY *);
 int	 p_hdir(const char *, struct passwd *, ENTRY *);
 int	 p_login(const char *, struct passwd *, ENTRY *);
 int	 p_passwd(const char *, struct passwd *, ENTRY *);
 int	 p_shell(const char *, struct passwd *, ENTRY *);
 int	 p_uid(const char *, struct passwd *, ENTRY *);
 char    *ttoa(char *, size_t, time_t);
 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);
 #endif
 extern	void (*Pw_error)(const char *name, int, int);