Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-24 16:38:57 +00:00
Code Issues Projects Releases Wiki Activity

neaten

Browse source
This commit is contained in:
John Kerl 2015-10-13 22:54:26 -04:00
parent f771e638b8
commit a17d1518bd
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
c/mapping/mlr_val.c
View file

@ -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(&regex, sregex, REG_NOSUB);
if (regmatch_or_die(&regex, sstr, 1, pmatch)) {
if (regmatch_or_die(&regex, sstr, 0, NULL)) {
regfree(&regex);
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};