Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove handling of conversion errors that can't happen any more

Browse Source 
Since we always convert to UTF-8, there can be no conversion errors and
we don't need to worry about them.
This commit is contained in:
Vadim Zeitlin
2021-07-15 22:21:15 +02:00
parent 78546007af
commit 10dce93921
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/regex.cpp
View File

@@ -161,7 +161,7 @@ public:
private: private:
// return the string containing the error message for the given err code // return the string containing the error message for the given err code
wxString GetErrorMsg(int errorcode, bool badconv) const; wxString GetErrorMsg(int errorcode) const;
// init the members // init the members
void Init() void Init()
@@ -219,19 +219,8 @@ wxRegExImpl::~wxRegExImpl()
Free(); Free();
} }
wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const wxString wxRegExImpl::GetErrorMsg(int errorcode) const
{ {
#ifdef WXREGEX_CONVERT_TO_MB
// currently only needed when using system library in Unicode mode
if ( badconv )
{
return _("conversion to 8-bit encoding failed");
}
#else
// 'use' badconv to avoid a compiler warning
(void)badconv;
#endif
wxString szError; wxString szError;
// first get the string length needed // first get the string length needed
@@ -562,20 +551,16 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// compile it // compile it
#ifdef WXREGEX_USING_BUILTIN #ifdef WXREGEX_USING_BUILTIN
bool conv = true;
// FIXME-UTF8: use wc_str() after removing ANSI build // FIXME-UTF8: use wc_str() after removing ANSI build
int errorcode = wx_re_comp(&m_RegEx, expr.c_str(), expr.length(), flagsRE); int errorcode = wx_re_comp(&m_RegEx, expr.c_str(), expr.length(), flagsRE);
#else #else
// FIXME-UTF8: this is potentially broken, we shouldn't even try it int errorcode = wx_regcomp(&m_RegEx, expr.utf8_str(), flagsRE);
// and should always use builtin regex library (or PCRE?)
const wxWX2MBbuf conv = expr.mbc_str();
int errorcode = conv ? regcomp(&m_RegEx, conv, flagsRE) : REG_BADPAT;
#endif #endif
if ( errorcode ) if ( errorcode )
{ {
wxLogError(_("Invalid regular expression '%s': %s"), wxLogError(_("Invalid regular expression '%s': %s"),
expr, GetErrorMsg(errorcode, !conv)); expr, GetErrorMsg(errorcode));
m_isCompiled = false; m_isCompiled = false;
} }
@@ -682,9 +667,9 @@ bool wxRegExImpl::Matches(const wxRegChar *str,
#if defined WXREGEX_USING_BUILTIN #if defined WXREGEX_USING_BUILTIN
int rc = wx_re_exec(&self->m_RegEx, str, len, NULL, m_nMatches, matches, flagsRE); int rc = wx_re_exec(&self->m_RegEx, str, len, NULL, m_nMatches, matches, flagsRE);
#elif defined WXREGEX_USING_RE_SEARCH #elif defined WXREGEX_USING_RE_SEARCH
int rc = str ? ReSearch(&self->m_RegEx, str, len, matches, flagsRE) : REG_BADPAT; int rc = ReSearch(&self->m_RegEx, str, len, matches, flagsRE);
#else #else
int rc = str ? wx_regexec(&self->m_RegEx, str, m_nMatches, matches, flagsRE) : REG_BADPAT; int rc = wx_regexec(&self->m_RegEx, str, len, m_nMatches, matches, flagsRE);
#endif #endif
switch ( rc ) switch ( rc )
@@ -696,7 +681,7 @@ bool wxRegExImpl::Matches(const wxRegChar *str,
default: default:
// an error occurred // an error occurred
wxLogError(_("Failed to find match for regular expression: %s"), wxLogError(_("Failed to find match for regular expression: %s"),
GetErrorMsg(rc, !str)); GetErrorMsg(rc));
wxFALLTHROUGH; wxFALLTHROUGH;
case REG_NOMATCH: case REG_NOMATCH: