Regex: Fix compilation under OSX

Lib has been recompiled to target i386.
This commit is contained in:
Arkshine 2014-07-18 13:45:29 +02:00
parent 0ec65bef5b
commit ce92ef745c
3 changed files with 2 additions and 13 deletions

View File

@ -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;

View File

@ -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:

Binary file not shown.