Skip to content

Commit

Permalink
Revert "Made assert clickable (#1847) (#2022)"
Browse files Browse the repository at this point in the history
This reverts commit 86f7598.
  • Loading branch information
thomas-bc authored Aug 4, 2023
1 parent 9aa06fb commit a60a5c3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Fw/Logger/LogAssert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#else

#if FW_ASSERT_LEVEL == FW_FILEID_ASSERT
#define fileIdFs "Assert: %d:%d"
#define fileIdFs "Assert file ID %d: Line: %d "
#define ASSERT_CAST static_cast<POINTER_CAST>
#else
#define fileIdFs "Assert: \"%s:%d\""
#define fileIdFs "Assert file \"%s\": Line: %d "
#define ASSERT_CAST reinterpret_cast<POINTER_CAST>
#endif

Expand Down
4 changes: 2 additions & 2 deletions Fw/Test/UnitTestAssert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ namespace Test {
void UnitTestAssert::doAssert() {
this->m_assertFailed = true;
#if FW_ASSERT_LEVEL == FW_FILEID_ASSERT
(void)fprintf(stderr,"Assert: 0x%" PRIx32 ":%" PRI_PlatformUIntType "\n", this->m_file, this->m_lineNo);
(void)fprintf(stderr,"Assert File: 0x%" PRIx32 ", Line: %" PRI_PlatformUIntType "\n", this->m_file, this->m_lineNo);
#else
(void)fprintf(stderr,"Assert: %s:%" PRI_PlatformUIntType "\n", this->m_file.toChar(), this->m_lineNo);
(void)fprintf(stderr,"Assert File: %s, Line: %" PRI_PlatformUIntType "\n", this->m_file.toChar(), this->m_lineNo);
#endif
}

Expand Down
4 changes: 2 additions & 2 deletions Fw/Types/Assert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#else

#if FW_ASSERT_LEVEL == FW_FILEID_ASSERT
#define fileIdFs "Assert: 0x%08" PRIx32 ":%" PRI_PlatformUIntType
#define fileIdFs "Assert file ID 0x%08" PRIx32 ": Line: %" PRI_PlatformUIntType
#else
#define fileIdFs "Assert: \"%s:%" PRI_PlatformUIntType "\""
#define fileIdFs "Assert file \"%s\": Line: %" PRI_PlatformUIntType
#endif

namespace Fw {
Expand Down

0 comments on commit a60a5c3

Please sign in to comment.