From a17d1518bd2c3c28b42e7af6ddeadcfecb2c915c Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 13 Oct 2015 22:54:26 -0400 Subject: [PATCH] neaten --- c/mapping/mlr_val.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/c/mapping/mlr_val.c b/c/mapping/mlr_val.c index 8c8be704f..38fa74046 100644 --- a/c/mapping/mlr_val.c +++ b/c/mapping/mlr_val.c @@ -919,11 +919,10 @@ mv_t matches_no_precomp_func(mv_t* pval1, mv_t* pval2) { regex_t regex; char* sstr = s1; char* sregex = s2; - regmatch_t pmatch[1]; regcomp_or_die(®ex, sregex, REG_NOSUB); - if (regmatch_or_die(®ex, sstr, 1, pmatch)) { + if (regmatch_or_die(®ex, sstr, 0, NULL)) { regfree(®ex); return (mv_t) {.type = MT_BOOL, .u.boolv = TRUE}; } else { @@ -941,9 +940,7 @@ mv_t does_not_match_no_precomp_func(mv_t* pval1, mv_t* pval2) { // ---------------------------------------------------------------- // arg2 is a string, compiled to regex only once at alloc time mv_t matches_precomp_func(mv_t* pval1, regex_t* pregex, string_builder_t* psb) { - regmatch_t pmatch[1]; - - if (regmatch_or_die(pregex, pval1->u.strv, 1, pmatch)) { + if (regmatch_or_die(pregex, pval1->u.strv, 0, NULL)) { return (mv_t) {.type = MT_BOOL, .u.boolv = TRUE}; } else { return (mv_t) {.type = MT_BOOL, .u.boolv = FALSE};