summaryrefslogtreecommitdiffstats
path: root/usr.sbin/dhcpd
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2017-04-12 19:12:01 +0000
committerkrw <krw@openbsd.org>2017-04-12 19:12:01 +0000
commit3b0fbcd488bc731fe7f0623e67ba04d39b705792 (patch)
tree9b15228f7e75ea6135fa529f57c04377548fcb67 /usr.sbin/dhcpd
parentThe kernel has to slightly different version of SipHash_Final but with (diff)
downloadwireguard-openbsd-3b0fbcd488bc731fe7f0623e67ba04d39b705792.tar.xz
wireguard-openbsd-3b0fbcd488bc731fe7f0623e67ba04d39b705792.zip
Add missing function prototypes. Mark kw_cmp() as static like all
its friends.
Diffstat (limited to 'usr.sbin/dhcpd')
-rw-r--r--usr.sbin/dhcpd/conflex.c5
-rw-r--r--usr.sbin/dhcpd/confpars.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/dhcpd/conflex.c b/usr.sbin/dhcpd/conflex.c
index 5197917e352..73d463ac4e6 100644
--- a/usr.sbin/dhcpd/conflex.c
+++ b/usr.sbin/dhcpd/conflex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conflex.c,v 1.17 2017/02/13 22:33:39 krw Exp $ */
+/* $OpenBSD: conflex.c,v 1.18 2017/04/12 19:12:01 krw Exp $ */
/* Lexical scanner for dhcpd config file... */
@@ -82,6 +82,7 @@ static void skip_to_eol(FILE *);
static int read_string(FILE *);
static int read_num_or_name(int, FILE *);
static int intern(char *, int);
+static int kw_cmp(const void *, const void *);
void
new_parse(char *name)
@@ -343,7 +344,7 @@ static const struct keywords {
{ "vendor-class", TOK_VENDOR_CLASS }
};
-int
+static int
kw_cmp(const void *k, const void *e)
{
return (strcasecmp(k, ((const struct keywords *)e)->k_name));
diff --git a/usr.sbin/dhcpd/confpars.c b/usr.sbin/dhcpd/confpars.c
index 4d5f1d1eb1c..820556eb7d1 100644
--- a/usr.sbin/dhcpd/confpars.c
+++ b/usr.sbin/dhcpd/confpars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: confpars.c,v 1.31 2017/02/13 23:04:05 krw Exp $ */
+/* $OpenBSD: confpars.c,v 1.32 2017/04/12 19:12:01 krw Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 The Internet Software Consortium.
@@ -54,6 +54,8 @@
#include "dhctoken.h"
#include "log.h"
+int parse_cidr(FILE *, unsigned char *, unsigned char *);
+
/*
* conf-file :== parameters declarations EOF
* parameters :== <nil> | parameter | parameters parameter