From: krw <krw@openbsd.org>
Date: Sat, 2 May 2015 14:29:32 +0000 (+0000)
Subject: Hoist common assignments out of a series of if/if-else statements
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d37427b0b9a85ab33de663258d86eb13f59748b9;p=openbsd

Hoist common assignments out of a series of if/if-else statements
in get_token(). Simplifies code and shrinks future diff.

No intentional functional change.
---

diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index df77fb01ef6..f1e30909d32 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conflex.c,v 1.30 2015/05/02 12:37:35 krw Exp $	*/
+/*	$OpenBSD: conflex.c,v 1.31 2015/05/02 14:29:32 krw Exp $	*/
 
 /* Lexical scanner for dhclient config file. */
 
@@ -147,25 +147,19 @@ get_token(FILE *cfile)
 			skip_to_eol(cfile);
 			continue;
 		}
+		lexline = l;
+		lexchar = p;
 		if (c == '"') {
-			lexline = l;
-			lexchar = p;
 			ttok = read_string(cfile);
 			break;
 		}
 		if ((isascii(c) && isdigit(c)) || c == '-') {
-			lexline = l;
-			lexchar = p;
 			ttok = read_number(c, cfile);
 			break;
 		} else if (isascii(c) && isalpha(c)) {
-			lexline = l;
-			lexchar = p;
 			ttok = read_num_or_name(c, cfile);
 			break;
 		} else {
-			lexline = l;
-			lexchar = p;
 			tb[0] = c;
 			tb[1] = 0;
 			tval = tb;
diff --git a/usr.sbin/dhcpd/conflex.c b/usr.sbin/dhcpd/conflex.c
index ef41ae8c67e..5f31921190b 100644
--- a/usr.sbin/dhcpd/conflex.c
+++ b/usr.sbin/dhcpd/conflex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conflex.c,v 1.13 2015/05/02 12:37:35 krw Exp $	*/
+/*	$OpenBSD: conflex.c,v 1.14 2015/05/02 14:29:32 krw Exp $	*/
 
 /* Lexical scanner for dhcpd config file... */
 
@@ -131,25 +131,19 @@ get_token(FILE *cfile)
 			skip_to_eol(cfile);
 			continue;
 		}
+		lexline = l;
+		lexchar = p;
 		if (c == '"') {
-			lexline = l;
-			lexchar = p;
 			ttok = read_string(cfile);
 			break;
 		}
 		if ((isascii(c) && isdigit(c)) || c == '-') {
-			lexline = l;
-			lexchar = p;
 			ttok = read_number(c, cfile);
 			break;
 		} else if (isascii(c) && isalpha(c)) {
-			lexline = l;
-			lexchar = p;
 			ttok = read_num_or_name(c, cfile);
 			break;
 		} else {
-			lexline = l;
-			lexchar = p;
 			tb[0] = c;
 			tb[1] = 0;
 			tval = tb;