Index: src/diff.c ================================================================== --- src/diff.c +++ src/diff.c @@ -423,11 +423,11 @@ ReCompiled *pRe, /* The regular expression to be matched */ DLine *aDLine, /* First of N DLines to compare against */ int N /* Number of DLines to check */ ){ while( N-- ){ - if( re_exec(pRe, aDLine->z, LENGTH(aDLine)) ){ + if( re_execute(pRe, aDLine->z, LENGTH(aDLine)) ){ return 1; } aDLine++; } return 0; Index: src/regexp.c ================================================================== --- src/regexp.c +++ src/regexp.c @@ -178,11 +178,11 @@ } /* Run a compiled regular expression on the zero-terminated input ** string zIn[]. Return true on a match and false if there is no match. */ -int re_exec(ReCompiled *pRe, const unsigned char *zIn, int nIn){ +int re_execute(ReCompiled *pRe, const unsigned char *zIn, int nIn){ ReStateSet aStateSet[2], *pThis, *pNext; ReStateNumber aSpace[100]; ReStateNumber *pToFree; unsigned int i = 0; unsigned int iSwap = 0; @@ -599,11 +599,11 @@ } } /* ** Compile a textual regular expression in zIn[] into a compiled regular -** expression suitable for us by re_exec() and return a pointer to the +** expression suitable for us by re_execute() and return a pointer to the ** compiled regular expression in *ppRe. Return NULL on success or an ** error message if something goes wrong. */ const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){ ReCompiled *pRe; @@ -700,11 +700,11 @@ } sqlite3_set_auxdata(context, 0, pRe, (void(*)(void*))re_free); } zStr = (const unsigned char*)sqlite3_value_text(argv[1]); if( zStr!=0 ){ - sqlite3_result_int(context, re_exec(pRe, zStr, -1)); + sqlite3_result_int(context, re_execute(pRe, zStr, -1)); } } /* ** Invoke this routine in order to install the REGEXP function in an @@ -731,11 +731,11 @@ char zLine[2000]; while( fgets(zLine, sizeof(zLine), in) ){ ln++; n = (int)strlen(zLine); while( n && (zLine[n-1]=='\n' || zLine[n-1]=='\r') ) n--; - if( re_exec(pRe, (const unsigned char*)zLine, n) ){ + if( re_execute(pRe, (const unsigned char*)zLine, n) ){ printf("%s:%d:%.*s\n", zFile, ln, n, zLine); } } }