v5: reduce number of var declarations after statements, part 3

This allows us to build without:
  -Wno-declaration-after-statement

Test: TreeHugger, manually
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1f27e9b1611b3f0f1582c4d0d28a56786e728094

3 files changed, 16 insertions, 11 deletions

diff --git a/devtools/mk b/devtools/mk
index 408cc0f..870211a 100755
--- a/devtools/mk
+++ b/devtools/mk
@@ -20,7 +20,6 @@ declare -ar FLAGS=(
   '-Wuninitialized'
   '-Os'
   '-fomit-frame-pointer'
-  '-Wno-declaration-after-statement'
 )
 
 arm-linux-gnueabi-gcc "${FLAGS[@]}" apf_interpreter.c -c -o apf_interpreter.arm.o
diff --git a/v5/apf_interpreter.c b/v5/apf_interpreter.c
index e85516f..a51c69c 100644
--- a/v5/apf_interpreter.c
+++ b/v5/apf_interpreter.c
@@ -690,11 +690,13 @@ static int do_apf_run(apf_context* ctx) {
 #define ASSERT_IN_OUTPUT_BOUNDS(p, size) ASSERT_RETURN(IN_OUTPUT_BOUNDS(p, size))
 
     do {
-        APF_TRACE_HOOK(ctx->pc, ctx->R, ctx->program, ctx->program_len,
-                       ctx->packet, ctx->packet_len, ctx->mem.slot, ctx->ram_len);
-        if (ctx->pc == ctx->program_len + 1) return DROP;
-        if (ctx->pc == ctx->program_len) return PASS;
-        if (ctx->pc > ctx->program_len) return EXCEPTION;
+      APF_TRACE_HOOK(ctx->pc, ctx->R, ctx->program, ctx->program_len,
+                     ctx->packet, ctx->packet_len, ctx->mem.slot, ctx->ram_len);
+      if (ctx->pc == ctx->program_len + 1) return DROP;
+      if (ctx->pc == ctx->program_len) return PASS;
+      if (ctx->pc > ctx->program_len) return EXCEPTION;
+
+      {  /* half indent to avoid needless line length... */
 
         const u8 bytecode = ctx->program[ctx->pc++];
         const u32 opcode = EXTRACT_OPCODE(bytecode);
@@ -1059,6 +1061,7 @@ static int do_apf_run(apf_context* ctx) {
           default:  /* Unknown opcode */
             return EXCEPTION;  /* Bail out */
         }
+      }
     } while (instructions_remaining--);
     return EXCEPTION;
 }
diff --git a/v5/apf_interpreter_source.c b/v5/apf_interpreter_source.c
index 75793b3..1813cfd 100644
--- a/v5/apf_interpreter_source.c
+++ b/v5/apf_interpreter_source.c
@@ -155,11 +155,13 @@ static int do_apf_run(apf_context* ctx) {
 #define ASSERT_IN_OUTPUT_BOUNDS(p, size) ASSERT_RETURN(IN_OUTPUT_BOUNDS(p, size))
 
     do {
-        APF_TRACE_HOOK(ctx->pc, ctx->R, ctx->program, ctx->program_len,
-                       ctx->packet, ctx->packet_len, ctx->mem.slot, ctx->ram_len);
-        if (ctx->pc == ctx->program_len + 1) return DROP;
-        if (ctx->pc == ctx->program_len) return PASS;
-        if (ctx->pc > ctx->program_len) return EXCEPTION;
+      APF_TRACE_HOOK(ctx->pc, ctx->R, ctx->program, ctx->program_len,
+                     ctx->packet, ctx->packet_len, ctx->mem.slot, ctx->ram_len);
+      if (ctx->pc == ctx->program_len + 1) return DROP;
+      if (ctx->pc == ctx->program_len) return PASS;
+      if (ctx->pc > ctx->program_len) return EXCEPTION;
+
+      {  // half indent to avoid needless line length...
 
         const u8 bytecode = ctx->program[ctx->pc++];
         const u32 opcode = EXTRACT_OPCODE(bytecode);
@@ -524,6 +526,7 @@ static int do_apf_run(apf_context* ctx) {
           default:  // Unknown opcode
             return EXCEPTION;  // Bail out
         }
+      }
     } while (instructions_remaining--);
     return EXCEPTION;
 }