Skip to content

Commit afa2e0f

Browse files
committed
csfilter.cc: fix checker regex matching
Previously only whole strings were matched e.g. `COMPILER_WARNING`. Now we can use regexes like `COMPILER|DIVINE` as well. Fixes #23
1 parent ec6c253 commit afa2e0f

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/csfilter.cc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,10 @@ struct MsgFilter::Private {
7474
const RE reTmpCleaner = RE("(.*)");
7575

7676
void addMsgFilter(
77-
std::string checker,
77+
const std::string &checker,
7878
const std::string &regexp,
7979
const std::string &replacement = "")
8080
{
81-
if (checker.empty())
82-
// match everything
83-
checker = ".*";
84-
8581
this->repList.push_back(new MsgReplace(checker, regexp, replacement));
8682
}
8783
};
@@ -170,7 +166,7 @@ std::string MsgFilter::filterMsg(
170166
{
171167
std::string filtered = msg;
172168
for (const struct MsgReplace *rpl : d->repList)
173-
if (boost::regex_match(checker, rpl->reChecker))
169+
if (boost::regex_search(checker, rpl->reChecker))
174170
filtered = regexReplaceWrap(filtered, rpl->reMsg, rpl->replaceWith);
175171

176172
#if DEBUG_SUBST > 1

0 commit comments

Comments
 (0)