cleanup merge flub

bk: 4d07cf24wbz6NAIxssUJr_iZPYyTBg

diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 96678b7c705dd94cf3b40c17bde272af72d124d7..0e622c8d8df98024d58dbde7de338ee68b5bee24 100644 (file)
--- 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)