Revert "site, pubkeys: Avoid for (int a=..."

This reverts commit 983e0900816ece898f3d53a530fe0f2c73932bbc.

diff --git a/pubkeys.c b/pubkeys.c
index 6ea877b3c5fde82fe95746381b0453a9d80ce52b..6dc741b7f5f9e63480b09151c1d684c6d5a5c0bc 100644 (file)
--- 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 08875133c1cc5fd0ca95677412f88df35c7308ab..72cee24fc8d094d791a5ed8dab4b17ae71224671 100644 (file)
--- 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;