diff --git a/dlls/regex/CRegEx.cpp b/dlls/regex/CRegEx.cpp index 1a1cfdef..57b0ad38 100755 --- a/dlls/regex/CRegEx.cpp +++ b/dlls/regex/CRegEx.cpp @@ -347,7 +347,7 @@ const char *getSubstring(char *subject, size_t start, size_t end, char buffer[], const char *RegEx::GetSubstring(size_t start, char buffer[], size_t max, size_t *outlen) { - if (start < 0 || start >= mSubStrings.length()) + if (start >= mSubStrings.length()) { return NULL; } @@ -357,16 +357,6 @@ const char *RegEx::GetSubstring(size_t start, char buffer[], size_t max, size_t return getSubstring(subject, sub.start, sub.end, buffer, max, outlen); } -const char *RegEx::GetSubstring(size_t startOffset, size_t endOffset, char buffer[], size_t max, size_t *outlen) -{ - if (startOffset < 0 || endOffset < 0) - { - return NULL; - } - - return getSubstring(subject, startOffset, endOffset, buffer, max, outlen); -} - void RegEx::MakeSubpatternsTable(int numSubpatterns) { int nameCount = 0; @@ -556,7 +546,7 @@ int RegEx::Replace(char *text, size_t textMaxLen, const char *replace, size_t re * Checking backreference. * Which can be either $n, ${n} or ${name}. */ - size_t backref = -1; + int backref = -1; const char *walk = s; bool inBrace = false; bool nameCheck = false; diff --git a/dlls/regex/CRegEx.h b/dlls/regex/CRegEx.h index d1f19912..82db0311 100755 --- a/dlls/regex/CRegEx.h +++ b/dlls/regex/CRegEx.h @@ -73,7 +73,6 @@ public: int Replace(char *text, size_t text_maxlen, const char *replace, size_t replaceLen, int flags = 0); void ClearMatch(); const char *GetSubstring(size_t start, char buffer[], size_t max, size_t *outlen = NULL); - const char *GetSubstring(size_t start, size_t end, char buffer[], size_t max, size_t *outlen = NULL); void MakeSubpatternsTable(int numSubpatterns); public: diff --git a/dlls/regex/lib_darwin/libpcre.a b/dlls/regex/lib_darwin/libpcre.a index 33b63dfc..9eb3097c 100644 Binary files a/dlls/regex/lib_darwin/libpcre.a and b/dlls/regex/lib_darwin/libpcre.a differ