From e340aa7d80a9b2844cee91731496b4715b674f5e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Feb 2020 12:40:51 +0000
Subject: [PATCH] Revert "site, pubkeys: Avoid for (int a=..."

This reverts commit 983e0900816ece898f3d53a530fe0f2c73932bbc.
---
 pubkeys.c | 3 +--
 site.c    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pubkeys.c b/pubkeys.c
index 6ea877b..6dc741b 100644
--- a/pubkeys.c
+++ b/pubkeys.c
@@ -30,8 +30,7 @@ void keyset_dispose(struct peer_keyset **ks_io)
     ks->refcount--;
     assert(ks->refcount>=0);
     if (ks->refcount) return;
-    int ki;
-    for (ki=0; ki<ks->nkeys; ki++) {
+    for (int ki=0; ki<ks->nkeys; ki++) {
 	struct sigpubkey_if *pk=ks->keys[ki].pubkey;
 	pk->dispose(pk->st);
     }
diff --git a/site.c b/site.c
index 0887513..72cee24 100644
--- a/site.c
+++ b/site.c
@@ -787,8 +787,7 @@ static bool_t unpick_msg(struct site *st, uint32_t type,
     if (type_is_msg23(type) && m->remote.extrainfo.size) {
 	m->n_pubkeys_accepted_nom = buf_unprepend_uint8(&m->remote.extrainfo);
 	if (!m->n_pubkeys_accepted_nom) return False;
-	int ki_nom;
-	for (ki_nom=0; ki_nom<m->n_pubkeys_accepted_nom; ki_nom++) {
+	for (int ki_nom=0; ki_nom<m->n_pubkeys_accepted_nom; ki_nom++) {
 	    CHECK_AVAIL(&m->remote.extrainfo,KEYIDSZ);
 	    struct sigkeyid *kid = buf_unprepend(&m->remote.extrainfo,KEYIDSZ);
 	    if (ki_nom<MAX_SIG_KEYS) m->pubkeys_accepted[ki_nom] = kid;
-- 
2.30.2