From: krw <krw@openbsd.org>
Date: Sat, 18 Jan 2014 01:03:56 +0000 (+0000)
Subject: Make parse_warn() messages consistantly use 'expecting' rather
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9ccdfb268b24f9c0a032edb83f309f80cf9f237e;p=openbsd

Make parse_warn() messages consistantly use 'expecting' rather
than occasionally 'expected'. End all with a '.'.
---

diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 0121997042d..8a46b650a78 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clparse.c,v 1.73 2014/01/18 00:51:55 krw Exp $	*/
+/*	$OpenBSD: clparse.c,v 1.74 2014/01/18 01:03:56 krw Exp $	*/
 
 /* Parser for dhclient config and lease files. */
 
@@ -327,7 +327,7 @@ parse_option_list(FILE *cfile, u_int8_t *list, size_t sz)
 			return (0);
 		}
 		if (!is_identifier(token)) {
-			parse_warn("expected option name.");
+			parse_warn("expecting option name.");
 			goto syntaxerror;
 		}
 		/*
@@ -340,7 +340,7 @@ parse_option_list(FILE *cfile, u_int8_t *list, size_t sz)
 				break;
 
 		if (i == DHO_END) {
-			parse_warn("unexpected option name.");
+			parse_warn("expecting option name.");
 			goto syntaxerror;
 		}
 		if (ix == sz) {
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 0ef1f38bd2f..302d98bf825 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.32 2014/01/18 00:51:55 krw Exp $	*/
+/*	$OpenBSD: parse.c,v 1.33 2014/01/18 01:03:56 krw Exp $	*/
 
 /* Common parser code for dhcpd and dhclient. */
 
@@ -102,7 +102,7 @@ parse_semi(FILE *cfile)
 
 	token = next_token(NULL, cfile);
 	if (token != ';') {
-		parse_warn("semicolon expected.");
+		parse_warn("expecting semicolon.");
 		skip_to_semi(cfile);
 		return (0);
 	}
@@ -153,7 +153,7 @@ parse_hardware_param(FILE *cfile, struct ether_addr *hardware)
 
 	token = next_token(NULL, cfile);
 	if (token != TOK_ETHERNET) {
-		parse_warn("expecting 'ethernet'");
+		parse_warn("expecting 'ethernet'.");
 		if (token != ';')
 			skip_to_semi(cfile);
 		return;
@@ -178,7 +178,7 @@ parse_lease_time(FILE *cfile, time_t *timep)
 
 	token = next_token(&val, cfile);
 	if (token != TOK_NUMBER) {
-		parse_warn("Expecting numeric lease time");
+		parse_warn("expecting numeric lease time.");
 		if (token != ';')
 			skip_to_semi(cfile);
 		return;