diff options
| -rw-r--r-- | sbin/dhclient/conflex.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 3 | ||||
| -rw-r--r-- | sbin/dhclient/parse.c | 6 |
3 files changed, 3 insertions, 10 deletions
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c index cc166367197..184bd16c4ad 100644 --- a/sbin/dhclient/conflex.c +++ b/sbin/dhclient/conflex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conflex.c,v 1.38 2017/04/09 20:44:13 krw Exp $ */ +/* $OpenBSD: conflex.c,v 1.39 2017/06/10 17:56:29 krw Exp $ */ /* Lexical scanner for dhclient config file. */ @@ -107,8 +107,6 @@ new_parse(char *name) prev_line = line2; token_line = cur_line; tlname = name; - - warnings_occurred = 0; } static int diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 13db7633103..3c4804eab34 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.171 2017/04/18 13:59:09 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.172 2017/06/10 17:56:29 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -202,7 +202,6 @@ int next_token(char **, FILE *); int peek_token(char **, FILE *); /* parse.c */ -extern int warnings_occurred; void skip_to_semi(FILE *); int parse_semi(FILE *); char *parse_string(FILE *, unsigned int *); diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c index 082f15fd4ee..6604e5c8c0d 100644 --- a/sbin/dhclient/parse.c +++ b/sbin/dhclient/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.50 2017/04/09 20:44:13 krw Exp $ */ +/* $OpenBSD: parse.c,v 1.51 2017/06/10 17:56:29 krw Exp $ */ /* Common parser code for dhcpd and dhclient. */ @@ -418,8 +418,6 @@ parse_date(FILE *cfile) return (guess); } -int warnings_occurred; - void parse_warn(char *msg) { @@ -438,6 +436,4 @@ parse_warn(char *msg) } } log_warnx("%s^", spaces); - - warnings_occurred = 1; } |