Skip to content

Commit c3acb2e

Browse files
committed
Tweak error handling.
1 parent 2ea69af commit c3acb2e

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/log_surgeon/LogEvent.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,11 @@ auto LogEventView::get_capture_matches(Token const& root_var) const
116116
for (size_t i{0}; i < captures->size(); ++i) {
117117
auto const* const capture{captures->at(i)};
118118
auto position{get_capture_position(root_var, capture)};
119-
if (position.has_error()
120-
&& LogEventErrorCode{LogEventErrorCodeEnum::NoCaptureGroupMatch} == position.error())
121-
{
122-
continue;
119+
if (position.has_error()) {
120+
if (LogEventErrorCode{LogEventErrorCodeEnum::NoCaptureGroupMatch} == position.error()) {
121+
continue;
122+
}
123+
return position.error();
123124
}
124125
ordered_matches.emplace(capture, position.value(), true);
125126
}
@@ -218,7 +219,7 @@ template <>
218219
auto LogEventErrorCategory::message(LogEventErrorCodeEnum error_enum) const -> std::string {
219220
switch (error_enum) {
220221
case LogEventErrorCodeEnum::NoCaptureGroups:
221-
return "LogEvent NoCaptureGroup";
222+
return "LogEvent NoCaptureGroups";
222223
case LogEventErrorCodeEnum::NoCaptureGroupMatch:
223224
return "LogEvent NoCaptureGroupMatch";
224225
default:

0 commit comments

Comments
 (0)