protos

6 files changed, 27 insertions, 27 deletions

diff --git a/usr.bin/pctr/pctr.c b/usr.bin/pctr/pctr.c
index fba54d6e94e..370a8bc1c84 100644
--- a/usr.bin/pctr/pctr.c
+++ b/usr.bin/pctr/pctr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pctr.c,v 1.10 2003/06/10 22:20:49 deraadt Exp $	*/
+/*	$OpenBSD: pctr.c,v 1.11 2003/08/04 17:06:44 deraadt Exp $	*/
 
 /*
  * Pentium performance counter control program for OpenBSD.
@@ -297,7 +297,7 @@ list(int fam)
 	}
 }
 
-struct ctrfn *
+static struct ctrfn *
 fn2cfnp(u_int family, u_int sel)
 {
 	struct ctrfn *cfnp;
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 93eff118862..51f417accbf 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pr.c,v 1.18 2003/06/12 20:58:10 deraadt Exp $	*/
+/*	$OpenBSD: pr.c,v 1.19 2003/08/04 17:06:45 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1991 Keith Muller.
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)pr.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.18 2003/06/12 20:58:10 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.19 2003/08/04 17:06:45 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -833,7 +833,7 @@ flsh_errs(void)
     }
 }
 
-void
+static void
 ferrout(char *fmt, ...)
 {
     sigset_t block, oblock;
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 5c900c0daa9..c0890364005 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rup.c,v 1.17 2003/06/10 22:20:50 deraadt Exp $	*/
+/*	$OpenBSD: rup.c,v 1.18 2003/08/04 17:06:45 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993, John Brezak
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rup.c,v 1.17 2003/06/10 22:20:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rup.c,v 1.18 2003/08/04 17:06:45 deraadt Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -65,7 +65,7 @@ struct host_list {
 void usage(void);
 int print_rup_data(char *, statstime *host_stat);
 
-int
+static int
 search_host(struct in_addr addr)
 {
 	struct host_list *hp;
@@ -80,7 +80,7 @@ search_host(struct in_addr addr)
 	return(0);
 }
 
-void
+static void
 remember_host(struct in_addr addr)
 {
 	struct host_list *hp;
@@ -111,7 +111,7 @@ enum sort_type {
 };
 enum sort_type sort_type;
 
-int
+static int
 compare(const void *v1, const void *v2)
 {
 	const struct rup_data *d1 = v1;
@@ -132,7 +132,7 @@ compare(const void *v1, const void *v2)
 	}
 }
 
-void
+static void
 remember_rup_data(char *host, struct statstime *st)
 {
 	if (rup_data_idx >= rup_data_max) {
@@ -151,7 +151,7 @@ remember_rup_data(char *host, struct statstime *st)
 }
 
 
-int
+static int
 rstat_reply(char *replyp, struct sockaddr_in *raddrp)
 {
 	struct hostent *hp;
@@ -235,7 +235,7 @@ print_rup_data(char *host, statstime *host_stat)
 }
 
 
-void
+static void
 onehost(char *host)
 {
 	CLIENT *rstat_clnt;
@@ -263,7 +263,7 @@ onehost(char *host)
 	clnt_destroy(rstat_clnt);
 }
 
-void
+static void
 allhosts(void)
 {
 	statstime host_stat;
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 67028650da5..891aa09be0b 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ruptime.c,v 1.11 2003/06/25 21:18:47 deraadt Exp $	*/
+/*	$OpenBSD: ruptime.c,v 1.12 2003/08/04 17:06:45 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1983 The Regents of the University of California.
@@ -37,7 +37,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)ruptime.c	5.8 (Berkeley) 7/21/90";*/
-static char rcsid[] = "$OpenBSD: ruptime.c,v 1.11 2003/06/25 21:18:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ruptime.c,v 1.12 2003/08/04 17:06:45 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -66,6 +66,7 @@ int	hscmp(const void *, const void *);
 int	ucmp(const void *, const void *);
 int	lcmp(const void *, const void *);
 int	tcmp(const void *, const void *);
+char	*interval(time_t, char *);
 
 void morehosts(void);
 
@@ -82,7 +83,6 @@ main(int argc, char *argv[])
 	int aflg, cc, ch, f, i, maxloadav;
 	char buf[sizeof(struct whod)];
 	int (*cmp)(const void *, const void *) = hscmp;
-	char *interval(time_t, char *);
 
 	aflg = 0;
 	while ((ch = getopt(argc, argv, "alrut")) != -1)
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 532b0addae0..234b4edd76b 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rusers.c,v 1.25 2003/06/17 21:56:25 millert Exp $	*/
+/*	$OpenBSD: rusers.c,v 1.26 2003/08/04 17:06:46 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -47,7 +47,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: rusers.c,v 1.25 2003/06/17 21:56:25 millert Exp $";
+static const char rcsid[] = "$OpenBSD: rusers.c,v 1.26 2003/08/04 17:06:46 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -99,7 +99,9 @@ int ucompare(const void *, const void *);
 bool_t rusers_reply(char *, struct sockaddr_in *);
 bool_t rusers_reply_3(char *, struct sockaddr_in *);
 enum clnt_stat get_reply(int, in_port_t, u_long, struct rpc_msg *,
-    struct rmtcallres *, bool_t (*)());
+    struct rmtcallres *, bool_t (*)(char *, struct sockaddr_in *));
+enum clnt_stat rpc_setup(int *, XDR *, struct rpc_msg *,
+    struct rmtcallargs *, AUTH *, char *);
 __dead void usage(void);
 
 int aflag, hflag, iflag, lflag, uflag;
@@ -408,7 +410,7 @@ onehost(char *host)
 
 enum clnt_stat
 get_reply(int sock, in_port_t port, u_long xid, struct rpc_msg *msgp,
-	  struct rmtcallres *resp, bool_t (*callback)())
+    struct rmtcallres *resp, bool_t (*callback)(char *, struct sockaddr_in *))
 {
 	ssize_t inlen;
 	socklen_t fromlen;
@@ -456,7 +458,7 @@ retry:
 
 enum clnt_stat
 rpc_setup(int *fdp, XDR *xdr, struct rpc_msg *msg, struct rmtcallargs *args,
-	  AUTH *unix_auth, char *buf)
+    AUTH *unix_auth, char *buf)
 {
 	int on = 1;
 
diff --git a/usr.bin/sectok/main.c b/usr.bin/sectok/main.c
index 19651c035b6..d0085816ad0 100644
--- a/usr.bin/sectok/main.c
+++ b/usr.bin/sectok/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.8 2002/06/17 07:10:52 deraadt Exp $ */
+/*	$OpenBSD: main.c,v 1.9 2003/08/04 17:06:46 deraadt Exp $ */
 
 /*
  * Smartcard commander.
@@ -55,7 +55,7 @@ int     port, fd = -1, cla, sleepytime;
 volatile sig_atomic_t interrupted;
 FILE   *cmdf;
 
-void
+static void
 usage(void)
 {
 	fprintf(stderr,
@@ -64,9 +64,7 @@ usage(void)
 }
 
 int
-main(argc, argv)
-	int     argc;
-	char   *argv[];
+main(int argc, char *argv[])
 {
 	char    buf[_POSIX2_LINE_MAX], *scriptfile = NULL, *tp, *tv[MAXTOKENS];
 	int     i, tc;