diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index 1b2a28bc..dd4028a0 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -992,7 +992,8 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error { // TODO: arrays of arrays. cv := n.XType().ArrayLength().ConstValue() // TODO: check that cv is within size_t's range. - g.printf("for (size_t i = 0; i < %d; i++) { %s%s[i] = 0; }\n", cv, vPrefix, n.Name().String(g.tm)) + g.printf("{ size_t i; for (i = 0; i < %d; i++) { %s%s[i] = 0; }}\n", + cv, vPrefix, n.Name().String(g.tm)) } else { g.printf("%s%s = ", vPrefix, n.Name().String(g.tm)) if v := n.Value(); v != nil { diff --git a/example/peterface/peterface.c b/example/peterface/peterface.c index b606b254..8a7b9be9 100644 --- a/example/peterface/peterface.c +++ b/example/peterface/peterface.c @@ -2,11 +2,9 @@ // in the LICENSE file. /* -peterface decodes pjw's iconic face, stored as a GIF image. +peterface decodes pjw's iconic face, stored as a GIF image. To run: -Compile it in C99 mode: - -$cc -std=c99 peterface.c && ./a.out; rm -f a.out +$cc peterface.c && ./a.out; rm -f a.out for a C compiler $cc, such as clang or gcc. */ @@ -44,8 +42,10 @@ int main(int argc, char** argv) { return 1; } uint8_t* p = dst.ptr; - for (int y = 0; y < 32; y++) { - for (int x = 0; x < 32; x++) { + int y; + for (y = 0; y < 32; y++) { + int x; + for (x = 0; x < 32; x++) { putchar(*p++ ? '-' : '8'); } putchar('\n'); diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 592d56e4..d335b98f 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -472,8 +472,11 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, switch (coro_state) { PUFFS_COROUTINE_STATE(0); - for (size_t i = 0; i < 6; i++) { - v_c[i] = 0; + { + size_t i; + for (i = 0; i < 6; i++) { + v_c[i] = 0; + } }; v_i = 0; while (v_i < 6) { @@ -527,8 +530,11 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, switch (coro_state) { PUFFS_COROUTINE_STATE(0); - for (size_t i = 0; i < 7; i++) { - v_c[i] = 0; + { + size_t i; + for (i = 0; i < 7; i++) { + v_c[i] = 0; + } }; v_i = 0; while (v_i < 7) { @@ -717,8 +723,11 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, switch (coro_state) { PUFFS_COROUTINE_STATE(0); - for (size_t i = 0; i < 9; i++) { - v_c[i] = 0; + { + size_t i; + for (i = 0; i < 9; i++) { + v_c[i] = 0; + } }; v_i = 0; while (v_i < 9) { diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 3040f0d3..aac4f5d5 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -304,7 +304,8 @@ void bench_lzw_decode_xxx(const char* filename, uint64_t reps) { bench_start(); uint64_t n_bytes = 0; - for (uint64_t i = 0; i < reps; i++) { + uint64_t i; + for (i = 0; i < reps; i++) { dst.wi = 0; src.ri = 1; // Skip the literal width. puffs_gif_lzw_decoder dec; @@ -420,7 +421,8 @@ void bench_gif_decode_xxx(const char* filename, uint64_t reps) { bench_start(); uint64_t n_bytes = 0; - for (uint64_t i = 0; i < reps; i++) { + uint64_t i; + for (i = 0; i < reps; i++) { dst.wi = 0; src.ri = 0; puffs_gif_decoder dec; diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index c5d7750f..6507db0a 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -64,7 +64,8 @@ void bench_finish(uint64_t reps, uint64_t n_bytes) { int main(int argc, char** argv) { bool bench = false; - for (int i = 1; i < argc; i++) { + int i; + for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-b")) { bench = true; } @@ -81,11 +82,12 @@ int main(int argc, char** argv) { "https://godoc.org/golang.org/x/perf/cmd/benchstat\n"); } - for (int i = 0; i < proc_reps; i++) { + for (i = 0; i < proc_reps; i++) { bench_warm_up = i == 0; - for (proc* t = procs; *t; t++) { + proc* p; + for (p = procs; *p; p++) { proc_funcname = "unknown_funcname"; - (*t)(); + (*p)(); if (fail_msg[0]) { printf("%-16s%-8sFAIL %s: %s\n", proc_filename, cc, proc_funcname, fail_msg); @@ -167,7 +169,8 @@ char* hex_dump(char* msg, puffs_base_buf1* buf, size_t i) { return msg; } size_t base = i - (i & 15); - for (int j = -3 * 16; j <= +3 * 16; j += 16) { + int j; + for (j = -3 * 16; j <= +3 * 16; j += 16) { if ((j < 0) && (base < (size_t)(-j))) { continue; } @@ -177,7 +180,8 @@ char* hex_dump(char* msg, puffs_base_buf1* buf, size_t i) { } size_t n = buf->wi - b; INCR_FAIL(msg, " %06zx:", b); - for (size_t k = 0; k < 16; k++) { + size_t k; + for (k = 0; k < 16; k++) { if (k % 2 == 0) { INCR_FAIL(msg, " "); } @@ -188,7 +192,7 @@ char* hex_dump(char* msg, puffs_base_buf1* buf, size_t i) { } } INCR_FAIL(msg, " "); - for (size_t k = 0; k < 16; k++) { + for (k = 0; k < 16; k++) { char c = ' '; if (k < n) { c = buf->ptr[b + k];