ansi

1 files changed, 11 insertions, 22 deletions

diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 6e8087843bf..7ae7034f230 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppoll.c,v 1.4 2002/05/30 19:09:06 deraadt Exp $ */
+/*	$OpenBSD: yppoll.c,v 1.5 2002/07/19 03:16:24 deraadt Exp $ */
 /*	$NetBSD: yppoll.c,v 1.5 1996/05/13 02:46:36 thorpej Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: yppoll.c,v 1.4 2002/05/30 19:09:06 deraadt Exp $";
+static char rcsid[] = "$Id: yppoll.c,v 1.5 2002/07/19 03:16:24 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -56,30 +56,25 @@ static char rcsid[] = "$Id: yppoll.c,v 1.4 2002/05/30 19:09:06 deraadt Exp $";
 #include <rpcsvc/ypclnt.h>
 
 void
-usage()
+usage(void)
 {
-	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "\typpoll [-h host] [-d domainname] mapname\n");
+	fprintf(stderr, "Usage: yppoll [-h host] [-d domainname] mapname\n");
 	exit(1);
 }
 
 int
-get_remote_info(indomain, inmap, server, outorder, outname)
-	char *indomain;
-	char *inmap;
-	char *server;
-	int *outorder;
-	char **outname;
+get_remote_info(char *indomain, char *inmap, char *server, int *outorder,
+    char **outname)
 {
 	struct ypresp_order ypro;
 	struct ypresp_master yprm;
 	struct ypreq_nokey yprnk;
 	struct timeval tv;
-	int r;
 	struct sockaddr_in rsrv_sin;
 	int rsrv_sock;
 	CLIENT *client;
 	struct hostent *h;
+	int r;
 
 	bzero((char *)&rsrv_sin, sizeof rsrv_sin);
 	rsrv_sin.sin_len = sizeof rsrv_sin;
@@ -92,9 +87,8 @@ get_remote_info(indomain, inmap, server, outorder, outname)
 			fprintf(stderr, "unknown host %s\n", server);
 			exit(1);
 		}
-	} else {
+	} else
 		rsrv_sin.sin_addr.s_addr = *(u_int32_t *)h->h_addr;
-	}
 
 	tv.tv_sec = 10;
 	tv.tv_usec = 0;
@@ -137,17 +131,12 @@ get_remote_info(indomain, inmap, server, outorder, outname)
 }
 
 int
-main(argc, argv)
-	int  argc;
-	char **argv;
+main(int argc, char *argv[])
 {
-	char *domainname;
-	char *hostname = NULL;
-	char *inmap, *master;
-	int order;
+	char *domainname, *hostname = NULL, *inmap, *master;
 	extern char *optarg;
 	extern int optind;
-	int c, r;
+	int order, c, r;
 
 	yp_get_default_domain(&domainname);