Apply the following mechanical transformations in preparation for

ansification and constification:

    s{\s+__P\((\(.*?\))\)}{$1}g;
    s{\(\s+}{\(}g;
    s{\s+\)}{\)}g;
    s{\s+,}{,}g;
    s{(\s+)(for|if|switch|while)\(}{$1$2 \(}g;
    s{return ([^\(].*?);}{return ($1);}g;
    s{([\w\)])([!=+/\*-]?=)([\w\(+-])}{$1 $2 $3}g;
    s{\s+$}{\n};g

Also add $FreeBSD$ where needed.

MFC after:	1 week

6 files changed, 11 insertions, 11 deletions

diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index 376743b..6566f46 100644
--- a/usr.sbin/rpc.ypupdated/update.c
+++ b/usr.sbin/rpc.ypupdated/update.c
@@ -78,7 +78,7 @@ static char PKFILE[] = "/etc/publickey";
 #endif	/* YP */
 
 #ifdef YP
-static int _openchild __P(( char *, FILE **, FILE ** ));
+static int _openchild(char *, FILE **, FILE **);
 
 /*
  * Determine if requester is allowed to update the given map,
@@ -247,7 +247,7 @@ basename(path)
 extern char *malloc();
 #endif
 
-static int match __P(( char * , char * ));
+static int match(char *, char *);
 
 /*
  * Determine if requester is allowed to update the given map,
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index f66b974..8a97b19 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -55,7 +55,7 @@ int yp_del_record(dbp,key)
 	int rval;
 
 	if ((rval = (dbp->del)(dbp,key,0))) {
-		switch(rval) {
+		switch (rval) {
 		case 1:
 			return(YP_FALSE);
 			break;
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index 8fb1eba..b94b4b7 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -55,7 +55,7 @@ static int yp_domake(map, domain)
 {
 	int pid;
 
-	switch((pid = fork())) {
+	switch ((pid = fork())) {
 	case 0:
 		execlp(MAP_UPDATE_PATH, MAP_UPDATE, map, domain, (char *)NULL);
 		yp_error("couldn't exec map update process: %s",
@@ -104,7 +104,7 @@ int ypmap_update(netname, map, op, keylen, keyval, datlen, datval)
 	data.data = datval;
 	data.size = datlen;
 
-	switch(op) {
+	switch (op) {
 	case YPOP_DELETE: /* delete this entry */
 		rval = yp_del_record(dbp, &key);
 		if (rval == YP_TRUE)
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_extern.h b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
index 17e9ee9..6906f1c 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_extern.h
+++ b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
@@ -24,7 +24,7 @@
 #define MAP_UPDATE_PATH YPLIBDIR MAP_UPDATE
 
 extern int children;
-extern void ypu_prog_1 __P(( struct svc_req *, register SVCXPRT * ));
-extern int localupdate __P(( char *, char *, u_int, u_int, char *, u_int, char * ));
-extern int ypmap_update __P(( char *, char *, u_int, u_int, char *, u_int, char * ));
-extern int yp_del_record __P(( DB *, DBT * ));
+extern void ypu_prog_1(struct svc_req *, register SVCXPRT *);
+extern int localupdate(char *, char *, u_int, u_int, char *, u_int, char *);
+extern int ypmap_update(char *, char *, u_int, u_int, char *, u_int, char *);
+extern int yp_del_record(DB *, DBT *);
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 4d3f126..85cd7bf 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -197,7 +197,7 @@ main(argc, argv)
 	int ch;
 
 	while ((ch = getopt(argc, argv, "p:h")) != -1) {
-		switch(ch) {
+		switch (ch) {
 		case 'p':
 			yp_dir = optarg;
 			break;
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index b306268..08f9f56 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -136,7 +136,7 @@ unsigned int *ypu_insert_1_svc(args, svcreq)
 	static int res;
 	char *netname;
 	enum auth_stat astat;
-	
+
 	res = 0;
 
 	astat = yp_checkauth(svcreq);