diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-07-09 16:16:12 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-07-09 16:16:12 +0000 |
commit | 67d2f27fa2ccd13985d55f78f55b15c495611f18 (patch) | |
tree | 833148694a164f7087bfe8cb37aeb1e08e743143 | |
parent | b6846761b832cdab667a58b2cf37f4daed65c4be (diff) |
Clean out a few more unused/uninitialized variables.
ok millert@
-rw-r--r-- | sbin/dhclient/conflex.c | 5 | ||||
-rw-r--r-- | sbin/dhclient/dhcpd.h | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c index ee96bfeb9ca..bc6883a2c62 100644 --- a/sbin/dhclient/conflex.c +++ b/sbin/dhclient/conflex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conflex.c,v 1.7 2004/09/15 19:02:38 deraadt Exp $ */ +/* $OpenBSD: conflex.c,v 1.8 2005/07/09 16:16:11 krw Exp $ */ /* Lexical scanner for dhcpd config file... */ @@ -51,7 +51,6 @@ char *token_line; char *prev_line; char *cur_line; char *tlname; -int eol_token; static char line1[81]; static char line2[81]; @@ -125,7 +124,7 @@ get_token(FILE *cfile) c = get_char(cfile); - if (!(c == '\n' && eol_token) && isascii(c) && isspace(c)) + if (isascii(c) && isspace(c)) continue; if (c == '#') { skip_to_eol(cfile); diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 208193424f8..4b748afa006 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.39 2005/07/09 14:36:15 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.40 2005/07/09 16:16:11 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -261,9 +261,6 @@ int parse_warn(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); /* conflex.c */ extern int lexline, lexchar; extern char *token_line, *tlname; -extern char comments[4096]; -extern int comment_index; -extern int eol_token; void new_parse(char *); int next_token(char **, FILE *); int peek_token(char **, FILE *); |