[PATCH] Fix compilation of the CSV parser module.

Nix nix at esperi.org.uk
Wed Jul 20 16:51:55 CEST 2011


Commit 091f4c093b4836114badc8a7a4863bdac8757f42 changed the prototype of
cfg_check_inline_template(): adjust the CSV parser module's use of this
function accordingly.

Signed-off-by: Nick Alcock <nix at esperi.org.uk>
---
 modules/csvparser/csvparser-grammar.ym |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/csvparser/csvparser-grammar.ym b/modules/csvparser/csvparser-grammar.ym
index 90f1438..5ab0ea1 100644
--- a/modules/csvparser/csvparser-grammar.ym
+++ b/modules/csvparser/csvparser-grammar.ym
@@ -80,10 +80,10 @@ parser_column_opt
 
 parser_opt
         : KW_TEMPLATE '(' string ')'            {
-                                                  LogTemplate *template = cfg_check_inline_template(configuration, $3);
                                                   GError *error = NULL;
+                                                  LogTemplate *template = cfg_check_inline_template(configuration, $3, error);
 
-                                                  CHECK_ERROR(log_template_compile(template, $3, &error), @3, "Error compiling template (%s)", error->message);
+                                                  CHECK_ERROR(template != NULL, @3, "Error compiling template (%s)", error->message);
                                                   log_parser_set_template(last_parser, template);
                                                   free($3);
                                                 }
-- 
1.7.5.4.136.g9db10


More information about the syslog-ng mailing list