Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c16c021

Browse files
cmcgeorge-ertrustyrussell
authored andcommittedSep 8, 2021
Fix "for loop initial declarations are only allowed in C99 mode" compile errors.
1 parent 9fdfa56 commit c16c021

File tree

10 files changed

+70
-39
lines changed

10 files changed

+70
-39
lines changed
 

‎ccan/crc32c/crc32c.c

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ static inline uint32_t gf2_matrix_times(uint32_t *mat, uint32_t vec) {
7272
/* Multiply a matrix by itself over GF(2). Both mat and square must have 32
7373
rows. */
7474
static inline void gf2_matrix_square(uint32_t *square, uint32_t *mat) {
75-
for (unsigned n = 0; n < 32; n++)
75+
unsigned n;
76+
for (n = 0; n < 32; n++)
7677
square[n] = gf2_matrix_times(mat, mat[n]);
7778
}
7879

@@ -87,7 +88,8 @@ static void crc32c_zeros_op(uint32_t *even, size_t len) {
8788
/* put operator for one zero bit in odd */
8889
odd[0] = POLY; /* CRC-32C polynomial */
8990
uint32_t row = 1;
90-
for (unsigned n = 1; n < 32; n++) {
91+
unsigned n;
92+
for (n = 1; n < 32; n++) {
9193
odd[n] = row;
9294
row <<= 1;
9395
}
@@ -111,7 +113,7 @@ static void crc32c_zeros_op(uint32_t *even, size_t len) {
111113
} while (len);
112114

113115
/* answer ended up in odd -- copy to even */
114-
for (unsigned n = 0; n < 32; n++)
116+
for (n = 0; n < 32; n++)
115117
even[n] = odd[n];
116118
}
117119

@@ -121,7 +123,8 @@ static void crc32c_zeros(uint32_t zeros[][256], size_t len) {
121123
uint32_t op[32];
122124

123125
crc32c_zeros_op(op, len);
124-
for (unsigned n = 0; n < 256; n++) {
126+
unsigned n;
127+
for (n = 0; n < 256; n++) {
125128
zeros[0][n] = gf2_matrix_times(op, n);
126129
zeros[1][n] = gf2_matrix_times(op, n << 8);
127130
zeros[2][n] = gf2_matrix_times(op, n << 16);
@@ -265,7 +268,8 @@ uint32_t crc32c(uint32_t crc, void const *buf, size_t len) {
265268
static bool crc32c_once_little;
266269
static uint32_t crc32c_table_little[8][256];
267270
static void crc32c_init_sw_little(void) {
268-
for (unsigned n = 0; n < 256; n++) {
271+
unsigned n;
272+
for (n = 0; n < 256; n++) {
269273
uint32_t crc = n;
270274
crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1;
271275
crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1;
@@ -277,9 +281,10 @@ static void crc32c_init_sw_little(void) {
277281
crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1;
278282
crc32c_table_little[0][n] = crc;
279283
}
280-
for (unsigned n = 0; n < 256; n++) {
284+
for (n = 0; n < 256; n++) {
281285
uint32_t crc = crc32c_table_little[0][n];
282-
for (unsigned k = 1; k < 8; k++) {
286+
unsigned k;
287+
for (k = 1; k < 8; k++) {
283288
crc = crc32c_table_little[0][crc & 0xff] ^ (crc >> 8);
284289
crc32c_table_little[k][n] = crc;
285290
}
@@ -340,7 +345,8 @@ static bool crc32c_once_big;
340345
static uint32_t crc32c_table_big_byte[256];
341346
static uint64_t crc32c_table_big[8][256];
342347
static void crc32c_init_sw_big(void) {
343-
for (unsigned n = 0; n < 256; n++) {
348+
unsigned n;
349+
for (n = 0; n < 256; n++) {
344350
uint32_t crc = n;
345351
crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1;
346352
crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1;
@@ -352,10 +358,11 @@ static void crc32c_init_sw_big(void) {
352358
crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1;
353359
crc32c_table_big_byte[n] = crc;
354360
}
355-
for (unsigned n = 0; n < 256; n++) {
361+
for (n = 0; n < 256; n++) {
356362
uint32_t crc = crc32c_table_big_byte[n];
357363
crc32c_table_big[0][n] = swap(crc);
358-
for (unsigned k = 1; k < 8; k++) {
364+
unsigned k;
365+
for (k = 1; k < 8; k++) {
359366
crc = crc32c_table_big_byte[crc & 0xff] ^ (crc >> 8);
360367
crc32c_table_big[k][n] = swap(crc);
361368
}

‎ccan/crypto/xtea/xtea.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ uint64_t xtea_encipher(const struct xtea_secret *secret, uint64_t v)
1111
{
1212
const uint32_t delta=0x9E3779B9;
1313
uint32_t v0=(v>>32), v1=v, sum=0;
14+
int i;
1415

15-
for (int i=0; i < NUM_DOUBLE_ROUNDS; i++) {
16+
for (i=0; i < NUM_DOUBLE_ROUNDS; i++) {
1617
v0 += (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + secret->u.u32[sum & 3]);
1718
sum += delta;
1819
v1 += (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + secret->u.u32[(sum>>11) & 3]);
@@ -24,8 +25,9 @@ uint64_t xtea_decipher(const struct xtea_secret *secret, uint64_t e)
2425
{
2526
const uint32_t delta=0x9E3779B9;
2627
uint32_t v0=(e>>32), v1=e, sum=delta*NUM_DOUBLE_ROUNDS;
28+
int i;
2729

28-
for (int i=0; i < NUM_DOUBLE_ROUNDS; i++) {
30+
for (i=0; i < NUM_DOUBLE_ROUNDS; i++) {
2931
v1 -= (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + secret->u.u32[(sum>>11) & 3]);
3032
sum -= delta;
3133
v0 -= (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + secret->u.u32[sum & 3]);

‎ccan/edit_distance/edit_distance_dl.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ ed_dist edit_distance_dl(const ed_elem *src, ed_size slen,
4141
ed_dist *delcost = malloc(ED_TMAT_SIZE(slen + 1) * sizeof(ed_dist));
4242
ed_dist *delcostitr = delcost;
4343
ed_dist *delcostprevitr = delcost;
44+
ed_size i2, i1;
4445
*delcostitr++ = 0;
45-
for (ed_size i2 = 1; i2 <= slen; ++i2) {
46+
for (i2 = 1; i2 <= slen; ++i2) {
4647
ed_dist costi2 = ED_DEL_COST(src[i2 - 1]);
47-
for (ed_size i1 = 0; i1 < i2; ++i1) {
48+
for (i1 = 0; i1 < i2; ++i1) {
4849
*delcostitr++ = *delcostprevitr++ + costi2;
4950
}
5051
*delcostitr++ = 0;
@@ -61,10 +62,11 @@ ed_dist edit_distance_dl(const ed_elem *src, ed_size slen,
6162
ed_dist *inscost = malloc(ED_TMAT_SIZE(tlen + 1) * sizeof(ed_dist));
6263
ed_dist *inscostitr = inscost;
6364
ed_dist *inscostprevitr = inscost;
65+
ed_size j2, j1;
6466
*inscostitr++ = 0;
65-
for (ed_size j2 = 1; j2 <= tlen; ++j2) {
67+
for (j2 = 1; j2 <= tlen; ++j2) {
6668
ed_dist costj2 = ED_INS_COST(tgt[j2 - 1]);
67-
for (ed_size j1 = 0; j1 < j2; ++j1) {
69+
for (j1 = 0; j1 < j2; ++j1) {
6870
*inscostitr++ = *inscostprevitr++ + costj2;
6971
}
7072
*inscostitr++ = 0;
@@ -73,7 +75,8 @@ ed_dist edit_distance_dl(const ed_elem *src, ed_size slen,
7375
#endif
7476

7577
/* Initialize first row with maximal cost */
76-
for (ed_size i = 0; i < slen + 2; ++i) {
78+
ed_size i, j;
79+
for (i = 0; i < slen + 2; ++i) {
7780
dist[i] = maxdist;
7881
}
7982

@@ -83,11 +86,11 @@ ed_dist edit_distance_dl(const ed_elem *src, ed_size slen,
8386
/* Initialize row with cost to delete src[0..i-1] */
8487
dist[-1] = maxdist;
8588
dist[0] = 0;
86-
for (ed_size i = 1; i <= slen; ++i) {
89+
for (i = 1; i <= slen; ++i) {
8790
dist[i] = dist[i - 1] + ED_DEL_COST(src[i - 1]);
8891
}
8992

90-
for (ed_size j = 1; j <= tlen; ++j) {
93+
for (j = 1; j <= tlen; ++j) {
9194
/* Largest y < i such that src[y] = tgt[j] */
9295
ed_size lastsrc = 0;
9396
ed_dist *prevdist = dist;
@@ -101,7 +104,8 @@ ed_dist edit_distance_dl(const ed_elem *src, ed_size slen,
101104
* Loop invariant: lasttgt[ED_HASH_ELEM(c)] holds the largest
102105
* x < j such that tgt[x-1] = c or 0 if no such x exists.
103106
*/
104-
for (ed_size i = 1; i <= slen; ++i) {
107+
ed_size i;
108+
for (i = 1; i <= slen; ++i) {
105109
ed_size i1 = lastsrc;
106110
ed_size j1 = lasttgt[ED_HASH_ELEM(src[i - 1])];
107111

‎ccan/edit_distance/edit_distance_lcs.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
ed_dist edit_distance_lcs(const ed_elem *src, ed_size slen,
1414
const ed_elem *tgt, ed_size tlen)
1515
{
16+
ed_size i, j;
17+
1618
/* Optimization: Avoid malloc when row of distance matrix can fit on
1719
* the stack.
1820
*/
@@ -24,19 +26,19 @@ ed_dist edit_distance_lcs(const ed_elem *src, ed_size slen,
2426

2527
/* Initialize row with cost to delete src[0..i-1] */
2628
dist[0] = 0;
27-
for (ed_size i = 1; i <= slen; ++i) {
29+
for (i = 1; i <= slen; ++i) {
2830
dist[i] = dist[i - 1] + ED_DEL_COST(src[i - 1]);
2931
}
3032

31-
for (ed_size j = 1; j <= tlen; ++j) {
33+
for (j = 1; j <= tlen; ++j) {
3234
/* Value for dist[j-1][i-1] (one row up, one col left). */
3335
ed_dist diagdist = dist[0];
3436
dist[0] = dist[0] + ED_INS_COST(tgt[j - 1]);
3537

3638
/* Loop invariant: dist[i] is the edit distance between first j
3739
* elements of tgt and first i elements of src.
3840
*/
39-
for (ed_size i = 1; i <= slen; ++i) {
41+
for (i = 1; i <= slen; ++i) {
4042
ed_dist nextdiagdist = dist[i];
4143

4244
if (ED_ELEM_EQUAL(src[i - 1], tgt[j - 1])) {

‎ccan/edit_distance/edit_distance_lev.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
ed_dist edit_distance_lev(const ed_elem *src, ed_size slen,
1414
const ed_elem *tgt, ed_size tlen)
1515
{
16+
ed_size i, j;
17+
1618
/* Optimization: Avoid malloc when row of distance matrix can fit on
1719
* the stack.
1820
*/
@@ -24,19 +26,19 @@ ed_dist edit_distance_lev(const ed_elem *src, ed_size slen,
2426

2527
/* Initialize row with cost to delete src[0..i-1] */
2628
dist[0] = 0;
27-
for (ed_size i = 1; i <= slen; ++i) {
29+
for (i = 1; i <= slen; ++i) {
2830
dist[i] = dist[i - 1] + ED_DEL_COST(src[i - 1]);
2931
}
3032

31-
for (ed_size j = 1; j <= tlen; ++j) {
33+
for (j = 1; j <= tlen; ++j) {
3234
/* Value for dist[j-1][i-1] (one row up, one col left). */
3335
ed_dist diagdist = dist[0];
3436
dist[0] = dist[0] + ED_INS_COST(tgt[j - 1]);
3537

3638
/* Loop invariant: dist[i] is the edit distance between first j
3739
* elements of tgt and first i elements of src.
3840
*/
39-
for (ed_size i = 1; i <= slen; ++i) {
41+
for (i = 1; i <= slen; ++i) {
4042
ed_dist nextdiagdist = dist[i];
4143

4244
if (ED_ELEM_EQUAL(src[i - 1], tgt[j - 1])) {

‎ccan/edit_distance/edit_distance_rdl.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
ed_dist edit_distance_rdl(const ed_elem *src, ed_size slen,
1414
const ed_elem *tgt, ed_size tlen)
1515
{
16+
ed_size i, j;
17+
1618
/* Optimization: Avoid malloc when required rows of distance matrix can
1719
* fit on the stack.
1820
*/
@@ -32,11 +34,11 @@ ed_dist edit_distance_rdl(const ed_elem *src, ed_size slen,
3234

3335
/* Initialize row with cost to delete src[0..i-1] */
3436
dist[0] = 0;
35-
for (ed_size i = 1; i <= slen; ++i) {
37+
for (i = 1; i <= slen; ++i) {
3638
dist[i] = dist[i - 1] + ED_DEL_COST(src[i - 1]);
3739
}
3840

39-
for (ed_size j = 1; j <= tlen; ++j) {
41+
for (j = 1; j <= tlen; ++j) {
4042
/* Value for dist[j-2][i-1] (two rows up, one col left). */
4143
/* Note: dist[0] is not initialized when j == 1, var unused. */
4244
ed_dist diagdist1 = prevdist[0];
@@ -51,7 +53,7 @@ ed_dist edit_distance_rdl(const ed_elem *src, ed_size slen,
5153
/* Loop invariant: dist[i] is the edit distance between first j
5254
* elements of tgt and first i elements of src.
5355
*/
54-
for (ed_size i = 1; i <= slen; ++i) {
56+
for (i = 1; i <= slen; ++i) {
5557
ed_dist nextdiagdist = dist[i];
5658

5759
if (ED_ELEM_EQUAL(src[i - 1], tgt[j - 1])) {

‎ccan/io/poll.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ bool add_listener(struct io_listener *l)
121121

122122
static int find_always(const struct io_plan *plan)
123123
{
124-
for (size_t i = 0; i < num_always; i++)
124+
size_t i = 0;
125+
126+
for (i = 0; i < num_always; i++)
125127
if (always[i] == plan)
126128
return i;
127129
return -1;
@@ -287,8 +289,10 @@ static bool *exclusive(struct io_plan *plan)
287289
/* For simplicity, we do one always at a time */
288290
static bool handle_always(void)
289291
{
292+
int i;
293+
290294
/* Backwards is simple easier to remove entries */
291-
for (int i = num_always - 1; i >= 0; i--) {
295+
for (i = num_always - 1; i >= 0; i--) {
292296
struct io_plan *plan = always[i];
293297

294298
if (num_exclusive && !*exclusive(plan))
@@ -323,10 +327,12 @@ bool backend_set_exclusive(struct io_plan *plan, bool excl)
323327
* else that we manipulate events. */
324328
static void exclude_pollfds(void)
325329
{
330+
size_t i;
331+
326332
if (num_exclusive == 0)
327333
return;
328334

329-
for (size_t i = 0; i < num_fds; i++) {
335+
for (i = 0; i < num_fds; i++) {
330336
struct pollfd *pfd = &pollfds[fds[i]->backend_info];
331337

332338
if (!fds[i]->exclusive[IO_IN])
@@ -343,10 +349,12 @@ static void exclude_pollfds(void)
343349

344350
static void restore_pollfds(void)
345351
{
352+
size_t i;
353+
346354
if (num_exclusive == 0)
347355
return;
348356

349-
for (size_t i = 0; i < num_fds; i++) {
357+
for (i = 0; i < num_fds; i++) {
350358
struct pollfd *pfd = &pollfds[fds[i]->backend_info];
351359

352360
if (fds[i]->listener) {

‎ccan/json_escape/json_escape.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ bool json_escape_eq(const struct json_escape *a, const struct json_escape *b)
2121

2222
bool json_escape_needed(const char *str, size_t len)
2323
{
24-
for (size_t i = 0; i < len; i++) {
24+
size_t i;
25+
for (i = 0; i < len; i++) {
2526
if ((unsigned)str[i] < ' '
2627
|| str[i] == 127
2728
|| str[i] == '"'

‎ccan/pipecmd/pipecmd.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ pid_t pipecmdarr(int *fd_tochild, int *fd_fromchild, int *fd_errfromchild,
115115
goto fail;
116116

117117
if (childpid == 0) {
118-
for (int i = 0; i < num_child_close; i++)
118+
int i;
119+
for (i = 0; i < num_child_close; i++)
119120
close(child_close[i]);
120121

121122
// Child runs command.
@@ -140,7 +141,7 @@ pid_t pipecmdarr(int *fd_tochild, int *fd_fromchild, int *fd_errfromchild,
140141

141142
/* Make (fairly!) sure all other fds are closed. */
142143
int max = sysconf(_SC_OPEN_MAX);
143-
for (int i = 3; i < max; i++)
144+
for (i = 3; i < max; i++)
144145
if (i != execfail[1])
145146
close(i);
146147

@@ -155,7 +156,8 @@ pid_t pipecmdarr(int *fd_tochild, int *fd_fromchild, int *fd_errfromchild,
155156
exit(127);
156157
}
157158

158-
for (int i = 0; i < num_par_close; i++)
159+
int i;
160+
for (i = 0; i < num_par_close; i++)
159161
close(par_close[i]);
160162

161163
/* Child will close this without writing on successful exec. */
@@ -175,7 +177,7 @@ pid_t pipecmdarr(int *fd_tochild, int *fd_fromchild, int *fd_errfromchild,
175177
return childpid;
176178

177179
fail:
178-
for (int i = 0; i < num_par_close; i++)
180+
for (i = 0; i < num_par_close; i++)
179181
close_noerr(par_close[i]);
180182
return -1;
181183
}

‎ccan/str/base32/base32.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ static bool decode_8_chars(const char c[8], beint64_t *res, int *bytes)
7070
{
7171
uint64_t acc = 0;
7272
size_t num_pad = 0;
73-
for (int i = 0; i < 8; i++) {
73+
int i;
74+
for (i = 0; i < 8; i++) {
7475
const char *p;
7576

7677
acc <<= 5;

0 commit comments

Comments
 (0)
Please sign in to comment.