From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Feb 2020 12:11:34 +0000 (+0000)
Subject: site, pubkeys: Avoid for (int a=...
X-Git-Tag: v0.6.0~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=983e0900816ece898f3d53a530fe0f2c73932bbc;p=secnet.git

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

In jessie, gcc hates this unless you pass -std=gnu11 or something.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/pubkeys.c b/pubkeys.c
index 6dc741b..6ea877b 100644
--- a/pubkeys.c
+++ b/pubkeys.c
@@ -30,7 +30,8 @@ void keyset_dispose(struct peer_keyset **ks_io)
     ks->refcount--;
     assert(ks->refcount>=0);
     if (ks->refcount) return;
-    for (int ki=0; ki<ks->nkeys; ki++) {
+    int ki;
+    for (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 72cee24..0887513 100644
--- a/site.c
+++ b/site.c
@@ -787,7 +787,8 @@ 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;
-	for (int ki_nom=0; ki_nom<m->n_pubkeys_accepted_nom; ki_nom++) {
+	int ki_nom;
+	for (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;