summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libexec/getty/main.c9
-rw-r--r--libexec/tftpd/tftpd.c14
-rw-r--r--usr.bin/asa/asa.c6
-rw-r--r--usr.bin/checknr/checknr.c8
-rw-r--r--usr.bin/rpcgen/rpc_parse.c4
-rw-r--r--usr.bin/rpcgen/rpc_parse.h4
-rw-r--r--usr.bin/rpcgen/rpc_util.c5
-rw-r--r--usr.bin/rpcgen/rpc_util.h6
-rw-r--r--usr.bin/tftp/main.c8
-rw-r--r--usr.sbin/config/ukc.h6
-rw-r--r--usr.sbin/rtsold/rtsold.c12
-rw-r--r--usr.sbin/spray/spray.c17
12 files changed, 44 insertions, 55 deletions
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 420e0990d64..d66e58ea8c9 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.25 2003/06/02 19:38:24 millert Exp $ */
+/* $OpenBSD: main.c,v 1.26 2003/06/25 21:11:10 deraadt Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -37,7 +37,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";*/
-static char rcsid[] = "$OpenBSD: main.c,v 1.25 2003/06/02 19:38:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.26 2003/06/25 21:11:10 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -89,8 +89,7 @@ struct utsname kerninfo;
char name[MAXLOGNAME];
char dev[] = _PATH_DEV;
char ttyn[32];
-char *portselector();
-char *ttyname();
+char *portselector(void);
#define OBUFSIZ 128
#define TABBUFSIZ 512
@@ -265,8 +264,6 @@ main(int argc, char *argv[])
exit(1);
}
if (AB) {
- extern char *autobaud();
-
tname = autobaud();
continue;
}
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index d8ab453c8a5..a25d898e86f 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftpd.c,v 1.27 2003/06/02 19:38:25 millert Exp $ */
+/* $OpenBSD: tftpd.c,v 1.28 2003/06/25 21:11:25 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -37,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)tftpd.c 5.13 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: tftpd.c,v 1.27 2003/06/02 19:38:25 millert Exp $";
+static char rcsid[] = "$OpenBSD: tftpd.c,v 1.28 2003/06/25 21:11:25 deraadt Exp $";
#endif /* not lint */
/*
@@ -95,9 +95,9 @@ int sendfile(struct formats *pf);
struct formats {
char *f_mode;
- int (*f_validate)();
- int (*f_send)();
- int (*f_recv)();
+ int (*f_validate)(char *, int);
+ int (*f_send)(struct formats *);
+ int (*f_recv)(struct formats *);
int f_convert;
} formats[] = {
{ "netascii", validate_access, sendfile, recvfile, 1 },
@@ -420,7 +420,7 @@ timer(int signo)
int
sendfile(struct formats *pf)
{
- struct tftphdr *dp, *r_init();
+ struct tftphdr *dp, *r_init(void);
struct tftphdr *ap; /* ack packet */
volatile unsigned short block = 1;
int size, n;
@@ -491,7 +491,7 @@ justquit(int signo)
int
recvfile(struct formats *pf)
{
- struct tftphdr *dp, *w_init();
+ struct tftphdr *dp, *w_init(void);
struct tftphdr *ap; /* ack buffer */
volatile unsigned short block = 0;
int n, size;
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 8fa539607d2..854ee908871 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asa.c,v 1.4 2003/06/10 22:20:44 deraadt Exp $ */
+/* $OpenBSD: asa.c,v 1.5 2003/06/25 21:08:59 deraadt Exp $ */
/* $NetBSD: asa.c,v 1.10 1995/04/21 03:01:41 cgd Exp $ */
/*
@@ -32,14 +32,14 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: asa.c,v 1.4 2003/06/10 22:20:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: asa.c,v 1.5 2003/06/25 21:08:59 deraadt Exp $";
#endif
#include <stdio.h>
#include <stdlib.h>
#include <err.h>
-static void asa();
+static void asa(FILE *);
int
main(int argc, char *argv[])
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index 55ea439326d..d42ef90f041 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checknr.c,v 1.10 2003/06/10 22:20:45 deraadt Exp $ */
+/* $OpenBSD: checknr.c,v 1.11 2003/06/25 21:09:09 deraadt Exp $ */
/* $NetBSD: checknr.c,v 1.4 1995/03/26 04:10:19 glass Exp $ */
/*
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)checknr.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: checknr.c,v 1.10 2003/06/10 22:20:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: checknr.c,v 1.11 2003/06/25 21:09:09 deraadt Exp $";
#endif
#endif /* not lint */
@@ -53,6 +53,8 @@ static char rcsid[] = "$OpenBSD: checknr.c,v 1.10 2003/06/10 22:20:45 deraadt Ex
*/
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <ctype.h>
#define MAXSTK 100 /* Stack size */
@@ -188,8 +190,6 @@ int sflag; /* -s: ignore \s */
int ncmds; /* size of knowncmds */
int slot; /* slot in knowncmds found by binsrch */
-char *malloc();
-
int
main(int argc, char *argv[])
{
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index e815939739e..e6671c24f3b 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_parse.c,v 1.12 2003/04/26 18:29:51 pvalchev Exp $ */
+/* $OpenBSD: rpc_parse.c,v 1.13 2003/06/25 21:09:26 deraadt Exp $ */
/* $NetBSD: rpc_parse.c,v 1.5 1995/08/29 23:05:55 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -64,7 +64,7 @@ static void unsigned_dec(char **);
* return the next definition you see
*/
definition *
-get_definition()
+get_definition(void)
{
definition *defp;
token tok;
diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h
index 3f3a6aeecd8..0e27817bd24 100644
--- a/usr.bin/rpcgen/rpc_parse.h
+++ b/usr.bin/rpcgen/rpc_parse.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_parse.h,v 1.6 2002/07/05 05:39:42 deraadt Exp $ */
+/* $OpenBSD: rpc_parse.h,v 1.7 2003/06/25 21:09:26 deraadt Exp $ */
/* $NetBSD: rpc_parse.h,v 1.3 1995/06/11 21:50:00 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -157,7 +157,7 @@ struct definition {
};
typedef struct definition definition;
-definition *get_definition();
+definition *get_definition(void);
struct bas_type {
char *name;
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 528ade2106c..66effcc278f 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_util.c,v 1.10 2002/07/05 05:39:42 deraadt Exp $ */
+/* $OpenBSD: rpc_util.c,v 1.11 2003/06/25 21:09:26 deraadt Exp $ */
/* $NetBSD: rpc_util.c,v 1.6 1995/08/29 23:05:57 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -96,8 +96,7 @@ definition *
findval(lst, val, cmp)
list *lst;
char *val;
- int (*cmp) ();
-
+ int (*cmp) (definition *, char *);
{
for (; lst != NULL; lst = lst->next) {
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index a9cc50f12b2..b03a677fa4d 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_util.h,v 1.11 2002/07/05 05:39:42 deraadt Exp $ */
+/* $OpenBSD: rpc_util.h,v 1.12 2003/06/25 21:09:26 deraadt Exp $ */
/* $NetBSD: rpc_util.h,v 1.3 1995/06/11 21:50:10 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -91,12 +91,12 @@ extern int nonfatalerrors;
/*
* rpc_util routines
*/
-void storeval();
+void storeval(list **, definition *);
#define STOREVAL(list,item) \
storeval(list,item)
-definition *findval();
+definition *findval(list *, char *, int (*)(definition *, char *));
#define FINDVAL(list,item,finder) \
findval(list, item, finder)
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index db8c273732a..45f06c6fbf7 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.15 2003/06/25 15:45:10 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.16 2003/06/25 21:09:37 deraadt Exp $ */
/* $NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $ */
/*
@@ -40,7 +40,7 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: main.c,v 1.15 2003/06/25 15:45:10 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.16 2003/06/25 21:09:37 deraadt Exp $";
#endif /* not lint */
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
@@ -85,7 +85,7 @@ int margc;
char *margv[MAXARGV+1];
char *prompt = "tftp";
jmp_buf toplevel;
-void intr();
+void intr(int);
struct servent *sp;
void get(int, char **);
@@ -539,7 +539,7 @@ status(int argc, char *argv[])
}
void
-intr(void)
+intr(int signo)
{
signal(SIGALRM, SIG_IGN);
diff --git a/usr.sbin/config/ukc.h b/usr.sbin/config/ukc.h
index 6435af30d12..b47897475cb 100644
--- a/usr.sbin/config/ukc.h
+++ b/usr.sbin/config/ukc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukc.h,v 1.10 2003/06/02 21:19:03 maja Exp $ */
+/* $OpenBSD: ukc.h,v 1.11 2003/06/25 21:10:12 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -134,7 +134,7 @@ int *get_extraloc(int);
char *get_pdevnames(int);
struct pdevinit *get_pdevinit(int);
-int more();
+int more(void);
void pnum(int);
void pdevnam(short);
void pdev(short);
@@ -153,7 +153,7 @@ void common_attr(char *, int, char);
void add_read(char *, char, char *, int, int *);
void add(char *, int, short, short);
-int config();
+int config(void);
void process_history(int, char *);
#define UC_CHANGE 'c'
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 87150bd6abc..901d4132be2 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtsold.c,v 1.29 2003/05/15 14:40:53 itojun Exp $ */
+/* $OpenBSD: rtsold.c,v 1.30 2003/06/25 21:10:33 deraadt Exp $ */
/* $KAME: rtsold.c,v 1.57 2002/09/20 21:59:55 itojun Exp $ */
/*
@@ -104,9 +104,7 @@ static void rtsold_set_dump_file(int);
static void usage(char *);
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
int s, ch, once = 0;
struct timeval *timeout;
@@ -437,7 +435,7 @@ bad:
}
void
-iflist_init()
+iflist_init(void)
{
struct ifinfo *ifi, *next;
@@ -528,7 +526,7 @@ make_packet(struct ifinfo *ifinfo)
}
static struct timeval *
-rtsol_check_timer()
+rtsol_check_timer(void)
{
static struct timeval returnval;
struct timeval now, rtsol_timer;
@@ -781,7 +779,7 @@ warnmsg(int priority, const char *func, const char *msg, ...)
* return a list of interfaces which is suitable to sending an RS.
*/
char **
-autoifprobe()
+autoifprobe(void)
{
static char **argv = NULL;
static int n = 0;
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index a3050e2baad..f030d77e6bc 100644
--- a/usr.sbin/spray/spray.c
+++ b/usr.sbin/spray/spray.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: spray.c,v 1.3 2002/06/02 06:42:29 deraadt Exp $
+ * $Id: spray.c,v 1.4 2003/06/25 21:10:19 deraadt Exp $
*/
#include <stdio.h>
@@ -41,8 +41,8 @@
#define SPRAYOVERHEAD 86
#endif
-void usage ();
-void print_xferstats ();
+void usage();
+void print_xferstats(int, int, double);
/* spray buffer */
char spray_buffer[SPRAYMAX];
@@ -53,9 +53,7 @@ struct timeval ONE_WAY = { 0, 0 };
struct timeval TIMEOUT = { 25, 0 };
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
char *progname;
spraycumul host_stats;
@@ -190,10 +188,7 @@ main(argc, argv)
void
-print_xferstats(packets, packetlen, xfertime)
- int packets;
- int packetlen;
- double xfertime;
+print_xferstats(int packets, int packetlen, double xfertime)
{
int datalen;
double pps; /* packets per second */
@@ -215,7 +210,7 @@ print_xferstats(packets, packetlen, xfertime)
void
-usage ()
+usage(void)
{
fprintf(stderr, "usage: spray [-c count] [-l length] [-d delay] host\n");
exit(1);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 02:03:43 +0000