Use automatic allocation for assertion error messages

This commit is contained in:
Rangi42
2024-02-28 20:09:49 -05:00
committed by Sylvie
parent ef1c1440a0
commit 002eed405b
3 changed files with 12 additions and 13 deletions

View File

@@ -422,24 +422,23 @@ void patch_CheckAssertions(std::deque<struct Assertion> &assertions)
switch (type) {
case ASSERT_FATAL:
fatal(assert.patch.src, assert.patch.lineNo, "%s",
!assert.message->empty() ? assert.message->c_str()
: "assert failure");
!assert.message.empty() ? assert.message.c_str()
: "assert failure");
case ASSERT_ERROR:
error(assert.patch.src, assert.patch.lineNo, "%s",
!assert.message->empty() ? assert.message->c_str()
: "assert failure");
!assert.message.empty() ? assert.message.c_str()
: "assert failure");
break;
case ASSERT_WARN:
warning(assert.patch.src, assert.patch.lineNo, "%s",
!assert.message->empty() ? assert.message->c_str()
: "assert failure");
!assert.message.empty() ? assert.message.c_str()
: "assert failure");
break;
}
} else if (isError && type == ASSERT_FATAL) {
fatal(assert.patch.src, assert.patch.lineNo,
"Failed to evaluate assertion%s%s",
!assert.message->empty() ? ": " : "",
assert.message->c_str());
!assert.message.empty() ? ": " : "", assert.message.c_str());
}
}
}