[master] 78467a6 Tidy up generated C output

Federico G. Schwindt fgsch at lodoss.net
Fri Jun 24 00:10:09 CEST 2016


commit 78467a608823ed62b2b52563a6fa529596a311c0
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Thu Jun 23 23:03:55 2016 +0100

    Tidy up generated C output

diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index 37482f0..a2562f5 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -265,7 +265,7 @@ parse_synthetic(struct vcc *tl)
 	Fb(tl, 1, "VRT_synth_page(ctx, ");
 	vcc_Expr(tl, STRING_LIST);
 	ERRCHK(tl);
-	Fb(tl, 0, ");\n");
+	Fb(tl, 1, ");\n");
 
 	ExpectErr(tl, ')');
 	vcc_NextToken(tl);
diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
index 9a1a72c..22d8c10 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -312,7 +312,7 @@ EmitInitFini(const struct vcc *tl)
 	}
 
 	Fc(tl, 0, "\t(void)VGC_function_vcl_init(ctx);\n");
-	Fc(tl, 0, "\treturn(*ctx->handling == VCL_RET_OK ? 0: -1);\n");
+	Fc(tl, 0, "\treturn (*ctx->handling == VCL_RET_OK ? 0: -1);\n");
 	Fc(tl, 0, "}\n");
 
 	/*
@@ -332,7 +332,7 @@ EmitInitFini(const struct vcc *tl)
 		VSB_destroy(&p->fin);
 	}
 
-	Fc(tl, 0, "\treturn(0);\n");
+	Fc(tl, 0, "\treturn (0);\n");
 	Fc(tl, 0, "}\n");
 
 	if (has_event) {
@@ -384,15 +384,15 @@ EmitInitFini(const struct vcc *tl)
 	Fc(tl, 0, "VGC_Event(VRT_CTX, enum vcl_event_e ev)\n");
 	Fc(tl, 0, "{\n");
 	Fc(tl, 0, "\tif (ev == VCL_EVENT_LOAD)\n");
-	Fc(tl, 0, "\t\treturn(VGC_Load(ctx));\n");
+	Fc(tl, 0, "\t\treturn (VGC_Load(ctx));\n");
 	if (has_event) {
 		Fc(tl, 0, "\tif (ev == VCL_EVENT_WARM)\n");
-		Fc(tl, 0, "\t\treturn(VGC_Warmup(ctx, ev));\n");
+		Fc(tl, 0, "\t\treturn (VGC_Warmup(ctx, ev));\n");
 		Fc(tl, 0, "\tif (ev == VCL_EVENT_COLD)\n");
-		Fc(tl, 0, "\t\treturn(VGC_Cooldown(ctx, ev));\n");
+		Fc(tl, 0, "\t\treturn (VGC_Cooldown(ctx, ev));\n");
 	}
 	Fc(tl, 0, "\tif (ev == VCL_EVENT_DISCARD)\n");
-	Fc(tl, 0, "\t\treturn(VGC_Discard(ctx));\n");
+	Fc(tl, 0, "\t\treturn (VGC_Discard(ctx));\n");
 	Fc(tl, 0, "\n");
 	if (!has_event)
 		Fc(tl, 0, "\t(void)vgc_warmupstep;\n");
@@ -656,7 +656,7 @@ vcc_CompileSource(struct vcc *tl, struct source *sp)
 			Fc(tl, 1, "  VRT_handling(ctx, VCL_RET_OK);\n");
 		Fc(tl, 1, "%s", VSB_data(tl->fm[i]));
 		if (method_tab[i].bitval == VCL_MET_INIT)
-			Fc(tl, 1, "  return(1);\n");
+			Fc(tl, 1, "  return (1);\n");
 		Fc(tl, 1, "}\n");
 	}
 



More information about the varnish-commit mailing list