1
0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 16:42:56 -08:00
This commit is contained in:
deraadt 2004-07-09 16:22:02 +00:00
parent 1616f8209c
commit 3dad9bb333
13 changed files with 56 additions and 94 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.31 2004/06/22 03:15:33 avsm Exp $ */
/* $OpenBSD: misc.c,v 1.32 2004/07/09 16:22:02 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@ -22,7 +22,7 @@
*/
#if !defined(lint) && !defined(LINT)
static char const rcsid[] = "$OpenBSD: misc.c,v 1.31 2004/06/22 03:15:33 avsm Exp $";
static char const rcsid[] = "$OpenBSD: misc.c,v 1.32 2004/07/09 16:22:02 deraadt Exp $";
#endif
/* vix 26jan87 [RCS has the rest of the log]
@ -707,7 +707,7 @@ long get_gmtoff(time_t *clock, struct tm *local)
* opens a UNIX domain socket that crontab uses to poke cron.
*/
int
open_socket()
open_socket(void)
{
int sock;
mode_t omask;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: db.c,v 1.7 2004/04/18 01:19:07 henning Exp $ */
/* $OpenBSD: db.c,v 1.8 2004/07/09 16:22:02 deraadt Exp $ */
/*
* Persistent database management routines for DHCPD.
@ -221,7 +221,7 @@ db_startup(void)
}
void
new_lease_file()
new_lease_file(void)
{
fflush(db_file);
rewind(db_file);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: eehandlers.c,v 1.10 2002/05/30 19:09:05 deraadt Exp $ */
/* $OpenBSD: eehandlers.c,v 1.11 2004/07/09 16:22:02 deraadt Exp $ */
/* $NetBSD: eehandlers.c,v 1.2 1996/02/28 01:13:22 thorpej Exp $ */
/*-
@ -93,9 +93,7 @@ static int doio(struct keytabent *, u_char *, ssize_t, int);
}
void
ee_hwupdate(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_hwupdate(struct keytabent *ktent, char *arg)
{
time_t t;
char *cp, *cp2;
@ -126,9 +124,7 @@ ee_hwupdate(ktent, arg)
}
void
ee_num8(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_num8(struct keytabent *ktent, char *arg)
{
u_char num8 = 0;
u_int num32;
@ -152,9 +148,7 @@ ee_num8(ktent, arg)
}
void
ee_num16(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_num16(struct keytabent *ktent, char *arg)
{
u_int16_t num16 = 0;
u_int num32;
@ -189,9 +183,7 @@ static struct strvaltabent scrsizetab[] = {
};
void
ee_screensize(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_screensize(struct keytabent *ktent, char *arg)
{
struct strvaltabent *svp;
u_char scsize;
@ -230,9 +222,7 @@ static struct strvaltabent truthtab[] = {
};
void
ee_truefalse(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_truefalse(struct keytabent *ktent, char *arg)
{
struct strvaltabent *svp;
u_char truth;
@ -264,9 +254,7 @@ ee_truefalse(ktent, arg)
}
void
ee_bootdev(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_bootdev(struct keytabent *ktent, char *arg)
{
u_char dev[5];
int i;
@ -336,9 +324,7 @@ ee_bootdev(ktent, arg)
}
void
ee_kbdtype(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_kbdtype(struct keytabent *ktent, char *arg)
{
u_char kbd = 0;
u_int kbd2;
@ -372,9 +358,7 @@ static struct strvaltabent constab[] = {
};
void
ee_constype(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_constype(struct keytabent *ktent, char *arg)
{
struct strvaltabent *svp;
u_char cons;
@ -408,9 +392,7 @@ ee_constype(ktent, arg)
#endif
void
ee_diagpath(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_diagpath(struct keytabent *ktent, char *arg)
{
char path[40];
@ -429,9 +411,7 @@ ee_diagpath(ktent, arg)
}
void
ee_banner(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_banner(struct keytabent *ktent, char *arg)
{
char string[80];
u_char enable;
@ -472,18 +452,14 @@ ee_banner(ktent, arg)
/* ARGSUSED */
void
ee_notsupp(ktent, arg)
struct keytabent *ktent;
char *arg;
ee_notsupp(struct keytabent *ktent, char *arg)
{
warnx("field `%s' not yet supported", ktent->kt_keyword);
}
static void
badval(ktent, arg)
struct keytabent *ktent;
char *arg;
badval(struct keytabent *ktent, char *arg)
{
warnx("inappropriate value `%s' for field `%s'", arg,
@ -491,11 +467,7 @@ badval(ktent, arg)
}
static int
doio(ktent, buf, len, wr)
struct keytabent *ktent;
u_char *buf;
ssize_t len;
int wr;
doio(struct keytabent *ktent, u_char *buf, ssize_t len, int wr)
{
int fd, rval = 0;
u_char *buf2;
@ -561,7 +533,7 @@ doio(ktent, buf, len, wr)
* of it sequentially starting at eeWriteCount[0].
*/
void
ee_updatechecksums()
ee_updatechecksums(void)
{
struct keytabent kt;
u_char checkme[EE_SIZE - EE_HWUPDATE_LOC];
@ -600,7 +572,7 @@ ee_updatechecksums()
}
void
ee_verifychecksums()
ee_verifychecksums(void)
{
struct keytabent kt;
u_char checkme[EE_SIZE - EE_HWUPDATE_LOC];

View File

@ -1,4 +1,4 @@
/* $OpenBSD: main.c,v 1.11 2003/09/26 16:09:27 deraadt Exp $ */
/* $OpenBSD: main.c,v 1.12 2004/07/09 16:22:02 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1996/05/16 16:00:55 thorpej Exp $ */
/*-
@ -115,9 +115,7 @@ int verbose = 0;
extern char *__progname;
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char *argv[])
{
int ch, do_stdin = 0;
char *cp, line[BUFSIZE];
@ -211,7 +209,7 @@ main(argc, argv)
#ifdef __sparc__
static int
getcputype()
getcputype(void)
{
int mib[2];
size_t len;
@ -232,8 +230,7 @@ getcputype()
* the table, and call the corresponding handler function.
*/
static void
action(line)
char *line;
action(char *line)
{
char *keyword, *arg, *cp;
struct keytabent *ktent;
@ -272,7 +269,7 @@ action(line)
* Dump the contents of the prom corresponding to all known keywords.
*/
static void
dump_prom()
dump_prom(void)
{
struct keytabent *ktent;
@ -289,7 +286,7 @@ dump_prom()
}
static void
usage()
usage(void)
{
#ifdef __sparc__

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ophandlers.c,v 1.7 2003/11/27 10:36:01 henning Exp $ */
/* $OpenBSD: ophandlers.c,v 1.8 2004/07/09 16:22:02 deraadt Exp $ */
/* $NetBSD: ophandlers.c,v 1.2 1996/02/28 01:13:30 thorpej Exp $ */
/*-
@ -77,8 +77,7 @@ static struct extabent opextab[] = {
};
char *
op_handler(keyword, arg)
char *keyword, *arg;
op_handler(char *keyword, char *arg)
{
struct opiocdesc opio;
struct extabent *ex;
@ -164,10 +163,7 @@ op_handler(keyword, arg)
/* ARGSUSED */
static void
op_notsupp(exent, opiop, arg)
struct extabent *exent;
struct opiocdesc *opiop;
char *arg;
op_notsupp(struct extabent *exent, struct opiocdesc *opiop, char *arg)
{
warnx("property `%s' not yet supported", exent->ex_keyword);
@ -178,7 +174,7 @@ op_notsupp(exent, opiop, arg)
* (Really! This is the only way I could get it to work!)
*/
void
op_dump()
op_dump(void)
{
struct opiocdesc opio1, opio2;
struct extabent *ex;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: hilinfo.c,v 1.4 2002/02/19 20:20:39 miod Exp $ */
/* $OpenBSD: hilinfo.c,v 1.5 2004/07/09 16:22:02 deraadt Exp $ */
/*
* Copyright (c) 1987-1993, The University of Utah and
* the Center for Software Science at the University of Utah (CSS).
@ -117,7 +117,7 @@ getinfo(dname)
}
void
printall()
printall(void)
{
int i;
@ -133,7 +133,7 @@ printall()
}
char *
tname()
tname(void)
{
struct hil_info *hp;
@ -146,7 +146,7 @@ tname()
}
void
usage()
usage(void)
{
extern char *__progname;

View File

@ -1,5 +1,5 @@
/* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */
/* $OpenBSD: create.c,v 1.21 2004/05/02 17:35:08 millert Exp $ */
/* $OpenBSD: create.c,v 1.22 2004/07/09 16:22:03 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
static const char rcsid[] = "$OpenBSD: create.c,v 1.21 2004/05/02 17:35:08 millert Exp $";
static const char rcsid[] = "$OpenBSD: create.c,v 1.22 2004/07/09 16:22:03 deraadt Exp $";
#endif
#endif /* not lint */
@ -76,7 +76,7 @@ static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *);
static void statf(int, FTSENT *);
void
cwalk()
cwalk(void)
{
FTS *t;
FTSENT *p;

View File

@ -1,5 +1,5 @@
/* $NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $ */
/* $OpenBSD: spec.c,v 1.20 2004/07/01 18:25:48 otto Exp $ */
/* $OpenBSD: spec.c,v 1.21 2004/07/09 16:22:03 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 6/6/93";
#else
static const char rcsid[] = "$OpenBSD: spec.c,v 1.20 2004/07/01 18:25:48 otto Exp $";
static const char rcsid[] = "$OpenBSD: spec.c,v 1.21 2004/07/09 16:22:03 deraadt Exp $";
#endif
#endif /* not lint */
@ -56,7 +56,7 @@ static void set(char *, NODE *);
static void unset(char *, NODE *);
NODE *
spec()
spec(void)
{
NODE *centry, *last;
char *p;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: verify.c,v 1.13 2003/06/02 23:36:54 millert Exp $ */
/* $OpenBSD: verify.c,v 1.14 2004/07/09 16:22:03 deraadt Exp $ */
/* $NetBSD: verify.c,v 1.10 1995/03/07 21:26:28 cgd Exp $ */
/*-
@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93";
#else
static const char rcsid[] = "$OpenBSD: verify.c,v 1.13 2003/06/02 23:36:54 millert Exp $";
static const char rcsid[] = "$OpenBSD: verify.c,v 1.14 2004/07/09 16:22:03 deraadt Exp $";
#endif
#endif /* not lint */
@ -61,7 +61,7 @@ static void miss(NODE *, char *, size_t);
static int vwalk(void);
int
verify()
verify(void)
{
int rval;
@ -72,7 +72,7 @@ verify()
}
static int
vwalk()
vwalk(void)
{
FTS *t;
FTSENT *p;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: rip6query.c,v 1.11 2003/06/26 19:47:10 deraadt Exp $ */
/* $OpenBSD: rip6query.c,v 1.12 2004/07/09 16:22:04 deraadt Exp $ */
/* $KAME: rip6query.c,v 1.17 2002/09/08 01:35:17 itojun Exp $ */
/*
@ -181,15 +181,14 @@ main(int argc, char *argv[])
}
static void
usage()
usage(void)
{
fprintf(stderr, "Usage: rip6query [-I iface] [-w wait] address\n");
}
/* getnameinfo() is preferred as we may be able to show ifindex as ifname */
static const char *
sa_n2a(sa)
struct sockaddr *sa;
sa_n2a(struct sockaddr *sa)
{
static char buf[NI_MAXHOST];
@ -201,8 +200,7 @@ sa_n2a(sa)
}
static const char *
inet6_n2a(addr)
struct in6_addr *addr;
inet6_n2a(struct in6_addr *addr)
{
static char buf[NI_MAXHOST];
@ -210,8 +208,7 @@ inet6_n2a(addr)
}
static void
sigalrm_handler(sig)
int sig;
sigalrm_handler(int sig)
{
_exit(0);

View File

@ -1,4 +1,4 @@
/* $OpenBSD: privsep.c,v 1.20 2004/07/03 23:40:44 djm Exp $ */
/* $OpenBSD: privsep.c,v 1.21 2004/07/09 16:22:04 deraadt Exp $ */
/*
* Copyright (c) 2003 Anil Madhavapeddy <anil@recoil.org>
@ -527,7 +527,7 @@ priv_open_config(void)
/* Ask if config file has been modified since last attempt to read it */
int
priv_config_modified()
priv_config_modified(void)
{
int cmd, res;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: wsconscfg.c,v 1.8 2003/07/18 22:58:56 david Exp $ */
/* $OpenBSD: wsconscfg.c,v 1.9 2004/07/09 16:22:04 deraadt Exp $ */
/* $NetBSD: wsconscfg.c,v 1.4 1999/07/29 18:24:10 augustss Exp $ */
/*
@ -51,7 +51,7 @@ static void usage(void);
int main(int, char**);
static void
usage()
usage(void)
{
extern char *__progname;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: wsfontload.c,v 1.6 2003/04/19 23:50:06 millert Exp $ */
/* $OpenBSD: wsfontload.c,v 1.7 2004/07/09 16:22:04 deraadt Exp $ */
/* $NetBSD: wsfontload.c,v 1.2 2000/01/05 18:46:43 ad Exp $ */
/*
@ -56,7 +56,7 @@ static void usage(void);
static int getencoding(char *);
static void
usage()
usage(void)
{
extern char *__progname;