ANSIfy and remove some dead code.

Sponsored by:	DARPA, NAI Labs

1 files changed, 21 insertions, 23 deletions

diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index ab70560..2ba3bac 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -64,8 +64,8 @@ struct dom_binding {};
 
 char *tempname;
 
-void reaper(sig)
-	int sig;
+void
+reaper(int sig)
 {
 	extern pid_t pid;
 	extern int pstat;
@@ -85,8 +85,8 @@ void reaper(sig)
 	return;
 }
 
-void install_reaper(on)
-	int on;
+void
+install_reaper(int on)
 {
 	if (on) {
 		signal(SIGCHLD, reaper);
@@ -98,9 +98,8 @@ void install_reaper(on)
 
 static struct passwd yp_password;
 
-static void copy_yp_pass(p, x, m)
-char *p;
-int x, m;
+static void
+copy_yp_pass(char *p, int x, int m)
 {
 	register char *t, *s = p;
 	static char *buf;
@@ -148,8 +147,8 @@ int x, m;
 	return;
 }
 
-static int validchars(arg)
-	char *arg;
+static int
+validchars(char *arg)
 {
 	int i;
 
@@ -171,9 +170,8 @@ static int validchars(arg)
 	return(0);
 }
 
-static int validate_master(opw, npw)
-	struct passwd *opw;
-	struct x_master_passwd *npw;
+static int
+validate_master(struct passwd *opw, struct x_master_passwd *npw)
 {
 
 	if (npw->pw_name[0] == '+' || npw->pw_name[0] == '-') {
@@ -198,9 +196,8 @@ static int validate_master(opw, npw)
 	return(0);
 }
 
-static int validate(opw, npw)
-	struct passwd *opw;
-	struct x_passwd *npw;
+static int
+validate(struct passwd *opw, struct x_passwd *npw)
 {
 
 	if (npw->pw_name[0] == '+' || npw->pw_name[0] == '-') {
@@ -259,8 +256,8 @@ static int validate(opw, npw)
  * all agree), then we use that domain. If we match the user in
  * more than one database, we must abort.
  */
-static char *find_domain(pw)
-	struct x_passwd *pw;
+static char *
+find_domain(struct x_passwd *pw)
 {
 	struct stat statbuf;
 	struct dirent *dirp;
@@ -314,9 +311,8 @@ static char *find_domain(pw)
 		return((char *)&domain);
 }
 
-static int update_inplace(pw, domain)
-	struct passwd *pw;
-	char *domain;
+static int
+update_inplace(struct passwd *pw, char *domain)
 {
 	DB *dbp = NULL;
 	DBT key = { NULL, 0 };
@@ -454,7 +450,8 @@ with the same name - continuing");
 	return(0);
 }
 
-static char *yp_mktmpnam()
+static char *
+yp_mktmpnam(void)
 {
 	static char path[MAXPATHLEN];
 	char *p;
@@ -694,8 +691,9 @@ cleaning up and bailing out");
  * than the last one. Since only the superuser is allowed to use it,
  * it is assumed that the caller knows what he's doing.
  */
-int *yppasswdproc_update_master_1_svc(master_yppasswd *argp,
-					struct svc_req *rqstp)
+int *
+yppasswdproc_update_master_1_svc(master_yppasswd *argp,
+    struct svc_req *rqstp)
 {
 	static int result;
 	int pfd, tfd;