summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2003-07-05 17:01:49 +0000
committerderaadt <deraadt@openbsd.org>2003-07-05 17:01:49 +0000
commitaa31cba261dc09c011e27efda4afc00b2babfd79 (patch)
treea2cdc2607bdb8c545b2e38365080ab3f3d0b32cb
parentsync with netbsd (diff)
downloadwireguard-openbsd-aa31cba261dc09c011e27efda4afc00b2babfd79.tar.xz
wireguard-openbsd-aa31cba261dc09c011e27efda4afc00b2babfd79.zip
protos
-rw-r--r--lib/libkeynote/keynote-keygen.c4
-rw-r--r--lib/libkeynote/keynote-main.c6
-rw-r--r--lib/libkeynote/keynote-sign.c4
-rw-r--r--lib/libkeynote/keynote-sigver.c4
-rw-r--r--lib/libkeynote/keynote-verify.c4
-rw-r--r--libexec/getty/main.c6
-rw-r--r--libexec/rpc.rquotad/rquotad.c4
-rw-r--r--libexec/rpc.rstatd/rstat_proc.c8
-rw-r--r--libexec/rpc.rstatd/rstatd.c8
-rw-r--r--libexec/rpc.rusersd/rusersd.c6
10 files changed, 33 insertions, 21 deletions
diff --git a/lib/libkeynote/keynote-keygen.c b/lib/libkeynote/keynote-keygen.c
index 5b457f91681..156bee94ed6 100644
--- a/lib/libkeynote/keynote-keygen.c
+++ b/lib/libkeynote/keynote-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-keygen.c,v 1.18 2002/05/27 06:29:14 deraadt Exp $ */
+/* $OpenBSD: keynote-keygen.c,v 1.19 2003/07/05 17:01:49 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -48,6 +48,8 @@
#include "assertion.h"
#include "signature.h"
+void keygenusage(void);
+
void
keygenusage(void)
{
diff --git a/lib/libkeynote/keynote-main.c b/lib/libkeynote/keynote-main.c
index e5b4b9088a8..f3721e1c1ab 100644
--- a/lib/libkeynote/keynote-main.c
+++ b/lib/libkeynote/keynote-main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-main.c,v 1.8 2001/09/03 20:14:51 deraadt Exp $ */
+/* $OpenBSD: keynote-main.c,v 1.9 2003/07/05 17:01:49 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -44,8 +44,10 @@
#include "header.h"
+void mainusage(void);
+
void
-mainusage()
+mainusage(void)
{
fprintf(stderr, "Usage:\n");
fprintf(stderr, "\tsign ...\n");
diff --git a/lib/libkeynote/keynote-sign.c b/lib/libkeynote/keynote-sign.c
index 45cf08d5a37..e8d7fcaae21 100644
--- a/lib/libkeynote/keynote-sign.c
+++ b/lib/libkeynote/keynote-sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-sign.c,v 1.13 2002/05/27 06:29:14 deraadt Exp $ */
+/* $OpenBSD: keynote-sign.c,v 1.14 2003/07/05 17:01:49 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -46,6 +46,8 @@
#include "header.h"
#include "keynote.h"
+void signusage(void);
+
void
signusage(void)
{
diff --git a/lib/libkeynote/keynote-sigver.c b/lib/libkeynote/keynote-sigver.c
index 5537ad4e8f1..451f134ea2a 100644
--- a/lib/libkeynote/keynote-sigver.c
+++ b/lib/libkeynote/keynote-sigver.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-sigver.c,v 1.12 2001/09/03 20:14:51 deraadt Exp $ */
+/* $OpenBSD: keynote-sigver.c,v 1.13 2003/07/05 17:01:49 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -46,6 +46,8 @@
#include "header.h"
#include "keynote.h"
+void sigverusage(void);
+
void
sigverusage(void)
{
diff --git a/lib/libkeynote/keynote-verify.c b/lib/libkeynote/keynote-verify.c
index b1f2d75635d..d7836201428 100644
--- a/lib/libkeynote/keynote-verify.c
+++ b/lib/libkeynote/keynote-verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-verify.c,v 1.11 2002/06/09 02:12:55 deraadt Exp $ */
+/* $OpenBSD: keynote-verify.c,v 1.12 2003/07/05 17:01:49 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -57,6 +57,8 @@
#include "header.h"
#include "keynote.h"
+void verifyusage(void);
+
void
verifyusage(void)
{
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index d66e58ea8c9..dcccaa56299 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.26 2003/06/25 21:11:10 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.27 2003/07/05 17:02:08 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.26 2003/06/25 21:11:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.27 2003/07/05 17:02:08 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -145,7 +145,7 @@ interrupt(int signo)
/*
* Action to take when getty is running too long.
*/
-void
+static void
timeoverrun(int signo)
{
struct syslog_data sdata = SYSLOG_DATA_INIT;
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index d7640db7d7e..eb68d79dc4a 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rquotad.c,v 1.16 2002/09/06 19:43:54 deraadt Exp $ */
+/* $OpenBSD: rquotad.c,v 1.17 2003/07/05 17:02:36 deraadt Exp $ */
/*
* by Manuel Bouyer (bouyer@ensta.fr). Public domain.
@@ -49,7 +49,7 @@ struct fs_stat *fs_begin = NULL;
int from_inetd = 1;
-void
+static void
cleanup(int signo)
{
(void) pmap_unset(RQUOTAPROG, RQUOTAVERS); /* XXX signal races */
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index ba422ec5229..e9654eba04b 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rstat_proc.c,v 1.22 2002/06/28 22:40:33 deraadt Exp $ */
+/* $OpenBSD: rstat_proc.c,v 1.23 2003/07/05 17:02:36 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -31,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
/*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.22 2002/06/28 22:40:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.23 2003/07/05 17:02:36 deraadt Exp $";
#endif
/*
@@ -99,7 +99,7 @@ static int stat_is_init = 0;
#define FSCALE (1 << 8)
#endif
-void
+static void
stat_init(void)
{
stat_is_init = 1;
@@ -276,6 +276,8 @@ setup(void)
dkinit(0);
}
+void rstat_service(struct svc_req *, SVCXPRT *);
+
void
rstat_service(struct svc_req *rqstp, SVCXPRT *transp)
{
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 9a64083016d..28d00000aee 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rstatd.c,v 1.14 2003/01/20 19:51:36 deraadt Exp $ */
+/* $OpenBSD: rstatd.c,v 1.15 2003/07/05 17:02:36 deraadt Exp $ */
/*-
* Copyright (c) 1993, John Brezak
@@ -34,7 +34,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: rstatd.c,v 1.14 2003/01/20 19:51:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rstatd.c,v 1.15 2003/07/05 17:02:36 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -63,14 +63,14 @@ int closedown = 20; /* how long to wait before going dormant */
volatile sig_atomic_t gotsig;
-void
+static void
getsig(int signo)
{
gotsig = 1;
}
-void
+static void
cleanup(void)
{
(void) pmap_unset(RSTATPROG, RSTATVERS_TIME); /* XXX signal races */
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 2151ab5b142..41a7adfa958 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rusersd.c,v 1.12 2003/01/20 19:51:36 deraadt Exp $ */
+/* $OpenBSD: rusersd.c,v 1.13 2003/07/05 17:02:37 deraadt Exp $ */
/*-
* Copyright (c) 1993 John Brezak
@@ -29,7 +29,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: rusersd.c,v 1.12 2003/01/20 19:51:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rusersd.c,v 1.13 2003/07/05 17:02:37 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -52,7 +52,7 @@ extern void rusers_service(struct svc_req *, SVCXPRT *);
int from_inetd = 1;
int utmp_fd;
-void
+static void
cleanup(int signo)
{
(void) pmap_unset(RUSERSPROG, RUSERSVERS_3); /* XXX signal races */