From: Shawn Routhier <sar@isc.org>
Date: Wed, 28 Nov 2012 20:55:32 +0000 (-0800)
Subject: [master]
X-Git-Tag: v4_3_0a1~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8acc987b9e4aaa9cb635802cfa398932480e6fb0;p=thirdparty%2Fdhcp.git

[master]
Remove unused variable.
[ISC-Bugs #31983]
---

diff --git a/RELNOTES b/RELNOTES
index e9a198ecc..d7ea47397 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -184,6 +184,9 @@ work on other platforms. Please report any problems and suggested fixes to
   loop when the peer names are mismatched.
   [ISC-Bugs #31231]
 
+- Remove an unused variable to keep compilers happy
+  [ISC-Bugs #31983]
+
 			Changes since 4.2.3
 
 ! Add a check for a null pointer before calling the regexec function.
diff --git a/common/parse.c b/common/parse.c
index eb13d22ad..ac8e6613e 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -1850,7 +1850,6 @@ int parse_base64 (data, cfile)
 	struct data_string *data;
 	struct parse *cfile;
 {
-	enum dhcp_token token;
 	const char *val;
 	int i, j, k;
 	unsigned acc = 0;
@@ -1880,7 +1879,7 @@ int parse_base64 (data, cfile)
 	do {
 		unsigned l;
 
-		token = next_token(&val, &l, cfile);
+		(void)next_token(&val, &l, cfile);
 		t = dmalloc(l + sizeof(*t), MDL);
 		if (t == NULL)
 			log_fatal("no memory for base64 buffer.");
@@ -1892,7 +1891,7 @@ int parse_base64 (data, cfile)
 		else
 			bufs = t;
 		last = t;
-		token = peek_token(&val, NULL, cfile);
+		(void)peek_token(&val, NULL, cfile);
 		valid_base64 = 1;
 		for (i = 0; val[i]; i++) {
 			/* Check to see if the character is valid.  It