From: Dave Hart <hart@ntp.org>
Date: Tue, 14 Dec 2010 20:10:12 +0000 (+0000)
Subject: cleanup merge flub
X-Git-Tag: NTP_4_2_7P94~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5736d1dd82b558419eb31463ab0edc55d5472d8f;p=thirdparty%2Fntp.git

cleanup merge flub

bk: 4d07cf24wbz6NAIxssUJr_iZPYyTBg
---

diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 96678b7c7..0e622c8d8 100644
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -759,6 +759,8 @@ readvar(
 	)
 {
 	associd_t	associd;
+	u_int		tmpcount;
+	u_int		u;
 	int		type;
 	struct varlist	tmplist[MAXLIST];
 
@@ -772,8 +774,8 @@ readvar(
 	memset(tmplist, 0, sizeof(tmplist));
 	if (pcmd->nargs > 1) {
 		tmpcount = pcmd->nargs - 1;
-		for (i = 0; i < tmpcount; i++)
-			doaddvlist(tmplist, pcmd->argval[1 + i].string);
+		for (u = 0; u < tmpcount; u++)
+			doaddvlist(tmplist, pcmd->argval[1 + u].string);
 	}
 
 	type = (0 == associd)