summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2014-01-12 04:17:37 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2014-01-12 04:17:37 +0000
commitdbad586d19d40f392e3baaaa99421fdb15579353 (patch)
tree6e7820169a1ff12e17599a1770b9f58c6fe46b88 /sbin
parentfda1b16ff80ee9409d34d798ccc0e92bf8a91f2e (diff)
Since the return value of read_client_conf() is not checked, don't
bother returning one.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dhclient/clparse.c6
-rw-r--r--sbin/dhclient/dhcpd.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 35c90a4c016..3cbad840568 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clparse.c,v 1.67 2014/01/10 01:25:03 krw Exp $ */
+/* $OpenBSD: clparse.c,v 1.68 2014/01/12 04:17:36 krw Exp $ */
/* Parser for dhclient config and lease files. */
@@ -58,7 +58,7 @@ void parse_reject_statement(FILE *);
* | client-declaration
* | client-declarations client-declaration
*/
-int
+void
read_client_conf(void)
{
FILE *cfile;
@@ -103,8 +103,6 @@ read_client_conf(void)
token = next_token(NULL, cfile); /* Clear the peek buffer */
fclose(cfile);
}
-
- return (!warnings_occurred);
}
/*
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index ef7d992f395..bf64a3399a6 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhcpd.h,v 1.128 2013/12/30 03:36:17 krw Exp $ */
+/* $OpenBSD: dhcpd.h,v 1.129 2014/01/12 04:17:36 krw Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -293,7 +293,7 @@ u_int32_t checksum(unsigned char *, unsigned, u_int32_t);
u_int32_t wrapsum(u_int32_t);
/* clparse.c */
-int read_client_conf(void);
+void read_client_conf(void);
void read_client_leases(void);
/* kroute.c */