MonetDB: Jul2017 - Simplify: remove the man-in-the-middle.

[Sjoerd Mullender]

Changeset: fa3be4427674 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa3be4427674
Modified Files:
        monetdb5/modules/mal/pcre.c
Branch: Jul2017
Log Message:

Simplify: remove the man-in-the-middle.


diffs (43 lines):

diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1886,29 +1886,31 @@ PCREjoin(bat *r1, bat *r2, bat lid, bat 
 str
 LIKEjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const str *esc, 
const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate)
 {
-       (void)nil_matches;
-       (void)estimate;
+       (void) nil_matches;
+       (void) estimate;
        return PCREjoin(r1, r2, *lid, *rid, slid ? *slid : 0, srid ? *srid : 0, 
*esc, 0);
 }
 
 str
 LIKEjoin1(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid, 
const bat *srid, const bit *nil_matches, const lng *estimate)
 {
-       const str esc = "";
-       return LIKEjoin(r1, r2, lid, rid, &esc, slid, srid, nil_matches, 
estimate);
+       (void) nil_matches;
+       (void) estimate;
+       return PCREjoin(r1, r2, *lid, *rid, slid ? *slid : 0, srid ? *srid : 0, 
"", 0);
 }
 
 str
 ILIKEjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const str *esc, 
const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate)
 {
-       (void)nil_matches;
-       (void)estimate;
+       (void) nil_matches;
+       (void) estimate;
        return PCREjoin(r1, r2, *lid, *rid, slid ? *slid : 0, srid ? *srid : 0, 
*esc, 1);
 }
 
 str
 ILIKEjoin1(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid, 
const bat *srid, const bit *nil_matches, const lng *estimate)
 {
-       const str esc = "";
-       return ILIKEjoin(r1, r2, lid, rid, &esc, slid,srid,nil_matches, 
estimate);
+       (void) nil_matches;
+       (void) estimate;
+       return PCREjoin(r1, r2, *lid, *rid, slid ? *slid : 0, srid ? *srid : 0, 
"", 1);
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list