X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Ffilter%2Ffilter-grammar-test.c;h=349dc475a7471468db7bf245a6c9ef420537305b;hb=cd46061a32b73d2986a12b396ac2c74c6b6c0ade;hp=70656e1a84f42f87b1b0a35bb1579f2b15e908c9;hpb=e4d2f27a74baf6942ac8fcafd5ea53e775ceceb3;p=lttng-tools.git

diff --git a/src/common/filter/filter-grammar-test.c b/src/common/filter/filter-grammar-test.c
index 70656e1a8..349dc475a 100644
--- a/src/common/filter/filter-grammar-test.c
+++ b/src/common/filter/filter-grammar-test.c
@@ -14,11 +14,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <errno.h>
 #include <inttypes.h>
+
+#include <common/compat/errno.h>
+#include "common/bytecode/bytecode.h"
 #include "filter-ast.h"
 #include "filter-parser.h"
-#include "filter-bytecode.h"
 
 int main(int argc, char **argv)
 {
@@ -26,18 +27,18 @@ int main(int argc, char **argv)
 	int ret;
 	int print_xml = 0, generate_ir = 0, generate_bytecode = 0,
 		print_bytecode = 0;
-	int i;
+	int argidx;
 
-	for (i = 1; i < argc; i++) {
-		if (strcmp(argv[i], "-p") == 0)
+	for (argidx = 1; argidx < argc; argidx++) {
+		if (strcmp(argv[argidx], "-p") == 0)
 			print_xml = 1;
-		else if (strcmp(argv[i], "-i") == 0)
+		else if (strcmp(argv[argidx], "-i") == 0)
 			generate_ir = 1;
-		else if (strcmp(argv[i], "-b") == 0)
+		else if (strcmp(argv[argidx], "-b") == 0)
 			generate_bytecode = 1;
-		else if (strcmp(argv[i], "-d") == 0)
+		else if (strcmp(argv[argidx], "-d") == 0)
 			filter_parser_debug = 1;
-		else if (strcmp(argv[i], "-B") == 0)
+		else if (strcmp(argv[argidx], "-B") == 0)
 			print_bytecode = 1;
 	}