X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Ffilter%2Ffilter-parser.ypp;h=0f11c234d6197f30ab3b9cea48ea749bf6697fbe;hb=05aa7e19ec97871aad18d7c9787c4c89611cd2cd;hp=d654ecc84ab7ac539925d4973d50027172d1ece8;hpb=348ddc5c9107149d48b1f12d31a7e75e9b73b4da;p=lttng-tools.git

diff --git a/src/common/filter/filter-parser.ypp b/src/common/filter/filter-parser.ypp
index d654ecc84..0f11c234d 100644
--- a/src/common/filter/filter-parser.ypp
+++ b/src/common/filter/filter-parser.ypp
@@ -16,13 +16,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include "common/bytecode/bytecode.h"
-#include "filter-ast.h"
+#include "common/bytecode/bytecode.hpp"
+#include "filter-ast.hpp"
 #include "filter-parser.hpp"
-#include "memstream.h"
+#include "memstream.hpp"
 
-#include <common/compat/errno.h>
-#include <common/macros.h>
+#include <common/compat/errno.hpp>
+#include <common/macros.hpp>
 
 #define WIDTH_u64_SCANF_IS_A_BROKEN_API	"20"
 #define WIDTH_o64_SCANF_IS_A_BROKEN_API	"22"
@@ -97,7 +97,7 @@ static struct gc_string *gc_string_alloc(struct filter_parser_ctx *parser_ctx,
 	for (alloclen = 8; alloclen < sizeof(long) + sizeof(*gstr) + len;
 	     alloclen *= 2);
 
-	gstr = (gc_string *) zmalloc(alloclen);
+	gstr = zmalloc<gc_string>(alloclen);
 	if (!gstr) {
 		goto end;
 	}
@@ -154,7 +154,7 @@ static struct filter_node *make_node(struct filter_parser_ctx *scanner,
 	struct filter_ast *ast = filter_parser_get_ast(scanner);
 	struct filter_node *node;
 
-	node = (filter_node *) zmalloc(sizeof(*node));
+	node = zmalloc<filter_node>();
 	if (!node)
 		return NULL;
 	memset(node, 0, sizeof(*node));
@@ -191,7 +191,7 @@ static struct filter_node *make_op_node(struct filter_parser_ctx *scanner,
 	struct filter_ast *ast = filter_parser_get_ast(scanner);
 	struct filter_node *node;
 
-	node = (filter_node *) zmalloc(sizeof(*node));
+	node = zmalloc<filter_node>();
 	if (!node)
 		return NULL;
 	memset(node, 0, sizeof(*node));
@@ -227,7 +227,7 @@ static struct filter_ast *filter_ast_alloc(void)
 {
 	struct filter_ast *ast;
 
-	ast = (filter_ast *) zmalloc(sizeof(*ast));
+	ast = zmalloc<filter_ast>();
 	if (!ast)
 		return NULL;
 	memset(ast, 0, sizeof(*ast));
@@ -257,7 +257,7 @@ struct filter_parser_ctx *filter_parser_ctx_alloc(FILE *input)
 
 	yydebug = filter_parser_debug;
 
-	parser_ctx = (filter_parser_ctx *) zmalloc(sizeof(*parser_ctx));
+	parser_ctx = zmalloc<filter_parser_ctx>();
 	if (!parser_ctx)
 		return NULL;
 	memset(parser_ctx, 0, sizeof(*parser_ctx));
@@ -428,7 +428,7 @@ error:
 
 %code provides
 {
-#include "common/macros.h"
+#include "common/macros.hpp"
 
 void setstring(struct filter_parser_ctx *parser_ctx, YYSTYPE *lvalp, const char *src);
 }