Skip to content

Commit 5f9ba8e

Browse files
committed
Merge branch 'pr/4972' into tip
2 parents 57ce598 + 0b82872 commit 5f9ba8e

10 files changed

+923
-5
lines changed

modules/csvparser/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set(CSVPARSER_SOURCES
44
csvparser-parser.c
55
csvparser-parser.h
66
csvparser-plugin.c
7+
filterx-func-parse-csv.h
8+
filterx-func-parse-csv.c
79
)
810

911
add_module(

modules/csvparser/Makefile.am

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ modules_csvparser_libcsvparser_la_SOURCES = \
55
modules/csvparser/csvparser-grammar.y \
66
modules/csvparser/csvparser-parser.c \
77
modules/csvparser/csvparser-parser.h \
8-
modules/csvparser/csvparser-plugin.c
8+
modules/csvparser/csvparser-plugin.c \
9+
modules/csvparser/filterx-func-parse-csv.h \
10+
modules/csvparser/filterx-func-parse-csv.c
911

1012
modules_csvparser_libcsvparser_la_CPPFLAGS = \
1113
$(AM_CPPFLAGS) \

modules/csvparser/csvparser-plugin.c

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "csvparser.h"
2626
#include "plugin.h"
2727
#include "plugin-types.h"
28+
#include "filterx-func-parse-csv.h"
2829

2930
extern CfgParser csvparser_parser;
3031

@@ -35,6 +36,11 @@ static Plugin csvparser_plugins[] =
3536
.name = "csv-parser",
3637
.parser = &csvparser_parser,
3738
},
39+
{
40+
.type = LL_CONTEXT_FILTERX_FUNC,
41+
.name = "parse_csv",
42+
.construct = filterx_function_construct_parse_csv,
43+
},
3844
};
3945

4046
gboolean

0 commit comments

Comments
 (0)