Skip to content

Commit 9041793

Browse files
tpamborjhedberg
authored andcommitted
Revert "ztest: Add validation of zassert strings"
This reverts commit ef73155. Signed-off-by: Tim Pambor <[email protected]>
1 parent 2d72d86 commit 9041793

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

subsys/testsuite/ztest/include/zephyr/ztest_assert.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ static inline bool z_zexpect_(bool cond, const char *file, int line)
7676

7777
#else /* CONFIG_ZTEST_ASSERT_VERBOSE != 0 */
7878

79-
static inline __printf_like(6, 7) bool z_zassert(bool cond, const char *default_msg,
80-
const char *file, int line, const char *func,
81-
const char *msg, ...)
79+
static inline bool z_zassert(bool cond, const char *default_msg, const char *file, int line,
80+
const char *func, const char *msg, ...)
8281
{
8382
if (cond == false) {
8483
va_list vargs;
@@ -101,9 +100,8 @@ static inline __printf_like(6, 7) bool z_zassert(bool cond, const char *default_
101100
return true;
102101
}
103102

104-
static inline __printf_like(6, 7) bool z_zassume(bool cond, const char *default_msg,
105-
const char *file, int line, const char *func,
106-
const char *msg, ...)
103+
static inline bool z_zassume(bool cond, const char *default_msg, const char *file, int line,
104+
const char *func, const char *msg, ...)
107105
{
108106
if (cond == false) {
109107
va_list vargs;
@@ -126,9 +124,8 @@ static inline __printf_like(6, 7) bool z_zassume(bool cond, const char *default_
126124
return true;
127125
}
128126

129-
static inline __printf_like(6, 7) bool z_zexpect(bool cond, const char *default_msg,
130-
const char *file, int line, const char *func,
131-
const char *msg, ...)
127+
static inline bool z_zexpect(bool cond, const char *default_msg, const char *file, int line,
128+
const char *func, const char *msg, ...)
132129
{
133130
if (cond == false) {
134131
va_list vargs;

0 commit comments

Comments
 (0)