summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/edquota/edquota.c64
-rw-r--r--usr.sbin/inetd/inetd.c8
-rw-r--r--usr.sbin/iostat/iostat.c8
-rw-r--r--usr.sbin/memconfig/memconfig.c11
-rw-r--r--usr.sbin/mrouted/defs.h4
-rw-r--r--usr.sbin/mrouted/vif.c4
-rw-r--r--usr.sbin/mtrace/mtrace.c7
-rw-r--r--usr.sbin/mtree/misc.c5
-rw-r--r--usr.sbin/mtree/mtree.c8
-rw-r--r--usr.sbin/portmap/portmap.c6
-rw-r--r--usr.sbin/quot/quot.c6
-rw-r--r--usr.sbin/quotaon/quotaon.c31
-rw-r--r--usr.sbin/rdate/rdate.c6
-rw-r--r--usr.sbin/rdconfig/rdconfig.c12
-rw-r--r--usr.sbin/repquota/repquota.c4
-rw-r--r--usr.sbin/rip6query/rip6query.c6
16 files changed, 70 insertions, 120 deletions
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index baedd57a70d..0b7c7ad9a93 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -38,7 +38,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.39 2003/06/02 23:36:53 millert Exp $";
+static char *rcsid = "$Id: edquota.c,v 1.40 2003/06/26 19:47:08 deraadt Exp $";
#endif /* not lint */
/*
@@ -93,7 +93,7 @@ int alldigits(char *s);
int hasquota(struct fstab *, int, char **);
void
-usage()
+usage(void)
{
(void)fprintf(stderr, "%s%s%s%s",
"Usage: edquota [-u] [-p username] username ...\n",
@@ -103,9 +103,7 @@ usage()
}
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
struct quotause *qup, *protoprivs, *curprivs;
u_int id, protoid;
@@ -190,10 +188,7 @@ main(argc, argv)
* getinoquota as to the interpretation of quota types.
*/
int
-getentry(name, quotatype, idp)
- char *name;
- int quotatype;
- u_int *idp;
+getentry(char *name, int quotatype, u_int *idp)
{
struct passwd *pw;
struct group *gr;
@@ -236,9 +231,7 @@ getentry(name, quotatype, idp)
* Collect the requested quota information.
*/
struct quotause *
-getprivs(id, quotatype)
- u_int id;
- int quotatype;
+getprivs(u_int id, int quotatype)
{
struct fstab *fs;
struct quotause *qup, *quptail;
@@ -328,10 +321,7 @@ getprivs(id, quotatype)
* Store the requested quota information.
*/
void
-putprivs(id, quotatype, quplist)
- long id;
- int quotatype;
- struct quotause *quplist;
+putprivs(long id, int quotatype, struct quotause *quplist)
{
struct quotause *qup;
int qcmd, fd;
@@ -356,8 +346,7 @@ putprivs(id, quotatype, quplist)
* Take a list of privileges and get it edited.
*/
int
-editit(tmpfile)
- char *tmpfile;
+editit(char *tmpfile)
{
pid_t pid, xpid;
char *argp[] = {"sh", "-c", NULL, NULL};
@@ -419,11 +408,7 @@ editit(tmpfile)
* Convert a quotause list to an ASCII file.
*/
int
-writeprivs(quplist, outfd, name, quotatype)
- struct quotause *quplist;
- int outfd;
- char *name;
- int quotatype;
+writeprivs(struct quotause *quplist, int outfd, char *name, int quotatype)
{
struct quotause *qup;
FILE *fd;
@@ -451,9 +436,7 @@ writeprivs(quplist, outfd, name, quotatype)
* Merge changes to an ASCII file into a quotause list.
*/
int
-readprivs(quplist, infd)
- struct quotause *quplist;
- int infd;
+readprivs(struct quotause *quplist, int infd)
{
struct quotause *qup;
FILE *fd;
@@ -562,13 +545,9 @@ readprivs(quplist, infd)
* Convert a quotause list to an ASCII file of grace times.
*/
int
-writetimes(quplist, outfd, quotatype)
- struct quotause *quplist;
- int outfd;
- int quotatype;
+writetimes(struct quotause *quplist, int outfd, int quotatype)
{
struct quotause *qup;
- char *cvtstoa();
FILE *fd;
ftruncate(outfd, 0);
@@ -594,9 +573,7 @@ writetimes(quplist, outfd, quotatype)
* Merge changes of grace times in an ASCII file into a quotause list.
*/
int
-readtimes(quplist, infd)
- struct quotause *quplist;
- int infd;
+readtimes(struct quotause *quplist, int infd)
{
struct quotause *qup;
FILE *fd;
@@ -666,8 +643,7 @@ readtimes(quplist, infd)
* Convert seconds to ASCII times.
*/
char *
-cvtstoa(time)
- time_t time;
+cvtstoa(time_t time)
{
static char buf[20];
@@ -693,10 +669,7 @@ cvtstoa(time)
* Convert ASCII input times to seconds.
*/
int
-cvtatos(time, units, seconds)
- time_t time;
- char *units;
- time_t *seconds;
+cvtatos(time_t time, char *units, time_t *seconds)
{
if (bcmp(units, "second", 6) == 0)
@@ -719,8 +692,7 @@ cvtatos(time, units, seconds)
* Free a list of quotause structures.
*/
void
-freeprivs(quplist)
- struct quotause *quplist;
+freeprivs(struct quotause *quplist)
{
struct quotause *qup, *nextqup;
@@ -734,8 +706,7 @@ freeprivs(quplist)
* Check whether a string is completely composed of digits.
*/
int
-alldigits(s)
- char *s;
+alldigits(char *s)
{
int c;
@@ -751,10 +722,7 @@ alldigits(s)
* Check to see if a particular quota is to be enabled.
*/
int
-hasquota(fs, type, qfnamep)
- struct fstab *fs;
- int type;
- char **qfnamep;
+hasquota(struct fstab *fs, int type, char **qfnamep)
{
char *opt;
char *cp;
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index c0f62e305b0..f679bc21fc5 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inetd.c,v 1.110 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: inetd.c,v 1.111 2003/06/26 19:47:08 deraadt Exp $ */
/* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */
/*
* Copyright (c) 1983,1991 The Regents of the University of California.
@@ -37,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/
-static char rcsid[] = "$OpenBSD: inetd.c,v 1.110 2003/06/02 23:36:53 millert Exp $";
+static char rcsid[] = "$OpenBSD: inetd.c,v 1.111 2003/06/26 19:47:08 deraadt Exp $";
#endif /* not lint */
/*
@@ -1830,7 +1830,7 @@ void
daytime_stream(int s, struct servtab *sep)
{
char buffer[256];
- time_t time(), clock;
+ time_t clock;
clock = time(NULL);
@@ -1844,7 +1844,7 @@ void
daytime_dg(int s, struct servtab *sep)
{
char buffer[256];
- time_t time(), clock;
+ time_t clock;
struct sockaddr_storage ss;
socklen_t size;
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 5b11ce4db11..a4fbf839650 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iostat.c,v 1.17 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: iostat.c,v 1.18 2003/06/26 19:47:09 deraadt Exp $ */
/* $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $ */
/*
@@ -115,7 +115,7 @@ static void cpustats(void);
static void disk_stats(double);
static void disk_stats2(double);
static void sigheader(int);
-static void header();
+static void header(void);
static void usage(void);
static void display(void);
static void selectdrives(int, char **);
@@ -125,9 +125,7 @@ void dkreadstats(void);
int dkinit(int);
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int ch, hdrcnt;
struct timeval tv;
diff --git a/usr.sbin/memconfig/memconfig.c b/usr.sbin/memconfig/memconfig.c
index 2712b6055d1..92e09bbb47e 100644
--- a/usr.sbin/memconfig/memconfig.c
+++ b/usr.sbin/memconfig/memconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memconfig.c,v 1.7 2003/03/13 09:09:48 deraadt Exp $ */
+/* $OpenBSD: memconfig.c,v 1.8 2003/06/26 19:47:09 deraadt Exp $ */
/*-
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
@@ -66,6 +66,7 @@ static void setfunc(int, int, char *[]);
static void clearfunc(int, int, char *[]);
static void helpfunc(int, int, char *[]);
static void help(char *);
+static struct mem_range_desc *mrgetall(int, int *);
struct
{
@@ -104,9 +105,7 @@ struct
};
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int i, memfd;
@@ -126,9 +125,7 @@ main(argc, argv)
}
static struct mem_range_desc *
-mrgetall(memfd, nmr)
- int memfd;
- int *nmr;
+mrgetall(int memfd, int *nmr)
{
struct mem_range_desc *mrd;
struct mem_range_op mro;
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 03a50cab947..acbd455afc9 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -250,6 +250,10 @@ extern void accept_g_ack(u_int32_t src, u_int32_t dst, char *p,
/* u_int is promoted u_char */
extern void accept_mtrace(u_int32_t src, u_int32_t dst,
u_int32_t group, char *data, u_int no, int datalen);
+extern void accept_info_request(u_int32_t src, u_int32_t dst,
+ u_char *p, int datalen);
+extern void accept_info_reply(u_int32_t src, u_int32_t dst,
+ u_char *p, int datalen);
/* kern.c */
extern void k_set_rcvbuf(int bufsize);
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index d0546e5e7d7..3a9d9a20c09 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -885,7 +885,7 @@ accept_neighbor_request2(u_int32_t src, u_int32_t dst)
}
void
-accept_info_request(u_int32_t src, u_int32_t dst, char *p, int datalen)
+accept_info_request(u_int32_t src, u_int32_t dst, u_char *p, int datalen)
{
u_char *q;
int len;
@@ -971,7 +971,7 @@ accept_neighbors2(u_int32_t src, u_int32_t dst, u_char *p, int datalen,
* Process an incoming info reply message.
*/
void
-accept_info_reply(u_int32_t src, u_int32_t dst, char *p, int datalen)
+accept_info_reply(u_int32_t src, u_int32_t dst, u_char *p, int datalen)
{
log(LOG_INFO, 0, "ignoring spurious DVMRP info reply from %s to %s",
inet_fmt(src, s1), inet_fmt(dst, s2));
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index fd2f631b02a..4135c098cb7 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -52,7 +52,7 @@
#ifndef lint
static char rcsid[] =
- "@(#) $Id: mtrace.c,v 1.16 2003/03/13 09:09:49 deraadt Exp $";
+ "@(#) $Id: mtrace.c,v 1.17 2003/06/26 19:47:09 deraadt Exp $";
#endif
#include <netdb.h>
@@ -131,7 +131,7 @@ u_int32_t tdst = 0; /* Address where trace is sent (last-hop) */
vifi_t numvifs; /* to keep loader happy */
/* (see kern.c) */
#ifndef SYSV
-extern long random();
+extern long random(void);
#endif
extern int errno;
@@ -159,6 +159,7 @@ void fixup_stats(struct resp_buf *base,
int print_stats(struct resp_buf *base,
struct resp_buf *prev, struct resp_buf *new);
void check_vif_state(void);
+u_long byteswap(u_long v);
int main(int argc, char *argv[]);
@@ -617,7 +618,7 @@ send_recv(dst, type, code, tries, save)
* it just snoops on what traces it can.
*/
void
-passive_mode()
+passive_mode(void)
{
struct timeval tr;
struct ip *ip;
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index 18fd7854f71..8e722dbc741 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.15 2003/06/02 23:36:54 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.16 2003/06/26 19:47:09 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.4 1995/03/07 21:26:23 cgd Exp $ */
/*-
@@ -92,8 +92,7 @@ parsekey(name, needvaluep)
}
int
-keycompare(a, b)
- const void *a, *b;
+keycompare(const void *a, const void *b)
{
return (strcmp(((KEY *)a)->name, ((KEY *)b)->name));
}
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index b76ded7f542..82453468213 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtree.c,v 1.16 2003/06/16 17:51:21 millert Exp $ */
+/* $OpenBSD: mtree.c,v 1.17 2003/06/26 19:47:09 deraadt Exp $ */
/* $NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $ */
/*-
@@ -40,7 +40,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: mtree.c,v 1.16 2003/06/16 17:51:21 millert Exp $";
+static const char rcsid[] = "$OpenBSD: mtree.c,v 1.17 2003/06/26 19:47:09 deraadt Exp $";
#endif
#endif /* not lint */
@@ -64,9 +64,7 @@ char fullpath[MAXPATHLEN];
static void usage(void);
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
extern int optind;
extern char *optarg;
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index cc7bcf672a5..96b50148ff3 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: portmap.c,v 1.28 2003/06/02 23:36:54 millert Exp $ */
+/* $OpenBSD: portmap.c,v 1.29 2003/06/26 19:47:09 deraadt Exp $ */
/*-
* Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@@ -40,7 +40,7 @@ char copyright[] =
#if 0
static char sccsid[] = "from: @(#)portmap.c 5.4 (Berkeley) 4/19/91";
#else
-static char rcsid[] = "$OpenBSD: portmap.c,v 1.28 2003/06/02 23:36:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: portmap.c,v 1.29 2003/06/26 19:47:09 deraadt Exp $";
#endif
#endif /* not lint */
@@ -260,7 +260,7 @@ main(int argc, char *argv[])
exit(1);
}
- (void)signal(SIGCHLD, (void (*)())reap);
+ (void)signal(SIGCHLD, (void (*)(int))reap);
svc_run();
syslog(LOG_ERR, "svc_run returned unexpectedly");
abort();
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 1ddfd3527fd..56aaa239df0 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quot.c,v 1.12 2003/06/25 21:18:24 deraadt Exp $ */
+/* $OpenBSD: quot.c,v 1.13 2003/06/26 19:47:09 deraadt Exp $ */
/* $NetBSD: quot.c,v 1.7.4.1 1996/05/31 18:06:36 jtc Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: quot.c,v 1.12 2003/06/25 21:18:24 deraadt Exp $";
+static char rcsid[] = "$Id: quot.c,v 1.13 2003/06/26 19:47:09 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -468,7 +468,7 @@ donames(int fd, struct fs *super, char *name)
}
static void
-usage()
+usage(void)
{
#ifdef COMPAT
fprintf(stderr, "Usage: quot [-nfcvha] [filesystem ...]\n");
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index c8717130cef..64b69729cc0 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -38,7 +38,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)quotaon.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: quotaon.c,v 1.18 2003/06/02 23:36:54 millert Exp $";
+static char *rcsid = "$Id: quotaon.c,v 1.19 2003/06/26 19:47:09 deraadt Exp $";
#endif /* not lint */
/*
@@ -60,9 +60,7 @@ int gflag; /* operate on group quotas */
int uflag; /* operate on user quotas */
int vflag; /* verbose */
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
struct fstab *fs;
char *qfnp, *whoami;
@@ -143,8 +141,7 @@ main(argc, argv)
exit(errs);
}
-usage(whoami)
- char *whoami;
+usage(char *whoami)
{
fprintf(stderr, "Usage:\n\t%s [-g] [-u] [-v] -a\n", whoami);
@@ -152,10 +149,8 @@ usage(whoami)
exit(1);
}
-quotaonoff(fs, offmode, type, qfpathname)
- struct fstab *fs;
- int offmode, type;
- char *qfpathname;
+int
+quotaonoff(struct fstab *fs, int offmode, int type, char *qfpathname)
{
if (strcmp(fs->fs_file, "/") && readonly(fs))
return (1);
@@ -184,9 +179,8 @@ quotaonoff(fs, offmode, type, qfpathname)
/*
* Check to see if target appears in list of size cnt.
*/
-oneof(target, list, cnt)
- char *target, *list[];
- int cnt;
+int
+oneof(char *target, char *list[], int cnt)
{
int i;
@@ -199,11 +193,8 @@ oneof(target, list, cnt)
/*
* Check to see if a particular quota is to be enabled.
*/
-hasquota(fs, type, qfnamep, force)
- struct fstab *fs;
- int type;
- char **qfnamep;
- int force;
+int
+hasquota(struct fstab *fs, int type, char **qfnamep, int force)
{
char *opt;
char *cp;
@@ -242,8 +233,8 @@ hasquota(fs, type, qfnamep, force)
* Verify file system is mounted and not readonly.
* MFS is special -- it puts "mfs:" in the kernel's mount table
*/
-readonly(fs)
- struct fstab *fs;
+int
+readonly(struct fstab *fs)
{
struct statfs fsbuf;
diff --git a/usr.sbin/rdate/rdate.c b/usr.sbin/rdate/rdate.c
index 7add012eab4..6c65fdc6149 100644
--- a/usr.sbin/rdate/rdate.c
+++ b/usr.sbin/rdate/rdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdate.c,v 1.19 2002/09/08 12:33:42 jakob Exp $ */
+/* $OpenBSD: rdate.c,v 1.20 2003/06/26 19:47:10 deraadt Exp $ */
/* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */
/*
@@ -42,7 +42,7 @@
#if 0
from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $";
#else
-static const char rcsid[] = "$OpenBSD: rdate.c,v 1.19 2002/09/08 12:33:42 jakob Exp $";
+static const char rcsid[] = "$OpenBSD: rdate.c,v 1.20 2003/06/26 19:47:10 deraadt Exp $";
#endif
#endif /* lint */
@@ -69,7 +69,7 @@ void ntp_client (const char *, struct timeval *, struct timeval *, int);
extern char *__progname;
void
-usage()
+usage(void)
{
(void) fprintf(stderr, "Usage: %s [-ncpsa] host\n", __progname);
(void) fprintf(stderr, " -n: use SNTP instead of RFC868 time protocol\n");
diff --git a/usr.sbin/rdconfig/rdconfig.c b/usr.sbin/rdconfig/rdconfig.c
index 1f883370f0d..0255ba2e0fb 100644
--- a/usr.sbin/rdconfig/rdconfig.c
+++ b/usr.sbin/rdconfig/rdconfig.c
@@ -47,16 +47,14 @@
#include <dev/ramdisk.h>
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
struct rd_conf rd;
int nblks, fd, error;
if (argc <= 2) {
fprintf(stderr, "usage: rdconfig <device> <%d-byte-blocks>\n",
- DEV_BSIZE);
+ DEV_BSIZE);
exit(1);
}
@@ -73,10 +71,8 @@ main(argc, argv)
exit(1);
}
- rd.rd_addr = mmap(NULL, rd.rd_size,
- PROT_READ | PROT_WRITE,
- MAP_ANON | MAP_PRIVATE,
- -1, 0);
+ rd.rd_addr = mmap(NULL, rd.rd_size, PROT_READ | PROT_WRITE,
+ MAP_ANON | MAP_PRIVATE, -1, 0);
if (rd.rd_addr == MAP_FAILED) {
perror("mmap");
exit(1);
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 5835f75b067..6eaa914a754 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -38,7 +38,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)repquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: repquota.c,v 1.24 2003/06/25 15:54:17 deraadt Exp $";
+static char *rcsid = "$Id: repquota.c,v 1.25 2003/06/26 19:47:10 deraadt Exp $";
#endif /* not lint */
/*
@@ -177,7 +177,7 @@ repquota(struct fstab *fs, int type, char *qfpathname)
FILE *qf;
uid_t id;
struct dqblk dqbuf;
- char *timeprt();
+ char *timeprt(time_t);
static struct dqblk zerodqblk;
static int warned = 0;
static int multiple = 0;
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index 53f34bff0b9..98baa66cd9a 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rip6query.c,v 1.10 2003/04/15 07:22:45 itojun Exp $ */
+/* $OpenBSD: rip6query.c,v 1.11 2003/06/26 19:47:10 deraadt Exp $ */
/* $KAME: rip6query.c,v 1.17 2002/09/08 01:35:17 itojun Exp $ */
/*
@@ -70,9 +70,7 @@ static const char *sa_n2a(struct sockaddr *);
static const char *inet6_n2a(struct in6_addr *);
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
struct netinfo6 *np;
struct sockaddr_in6 fsock;