summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmmar Ratnani <ammrat13@gmail.com>2021-03-27 21:58:21 -0400
committerAndreas Schneider <asn@cryptomilk.org>2023-02-16 15:25:52 +0100
commit2cc8cba6abb3c0ec7e30486accc624a3398cd7cf (patch)
treebded6d8a4f87b477ef11da66a90945b201fefb7d
parent8931845c35e78b5123d73430b071affd537d5935 (diff)
downloadcmocka-2cc8cba6abb3c0ec7e30486accc624a3398cd7cf.zip
cmocka-2cc8cba6abb3c0ec7e30486accc624a3398cd7cf.tar.gz
cmocka-2cc8cba6abb3c0ec7e30486accc624a3398cd7cf.tar.bz2
Fix issue with fail_msg
-rw-r--r--include/cmocka.h3
-rw-r--r--src/cmocka.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/include/cmocka.h b/include/cmocka.h
index 8791701..60ec46f 100644
--- a/include/cmocka.h
+++ b/include/cmocka.h
@@ -1704,7 +1704,7 @@ void skip(void);
void fail_msg(const char *msg, ...);
#else
#define fail_msg(msg, ...) do { \
- print_error("ERROR: " msg "\n", ##__VA_ARGS__); \
+ cm_print_error("ERROR: " msg "\n", ##__VA_ARGS__); \
fail(); \
} while (0)
#endif
@@ -2400,6 +2400,7 @@ void print_message(const char* const format, ...) CMOCKA_PRINTF_ATTRIBUTE(1, 2);
void print_error(const char* const format, ...) CMOCKA_PRINTF_ATTRIBUTE(1, 2);
void vprint_message(const char* const format, va_list args) CMOCKA_PRINTF_ATTRIBUTE(1, 0);
void vprint_error(const char* const format, va_list args) CMOCKA_PRINTF_ATTRIBUTE(1, 0);
+void cm_print_error(const char* const format, ...) CMOCKA_PRINTF_ATTRIBUTE(1, 2);
enum cm_message_output {
CM_OUTPUT_STDOUT,
diff --git a/src/cmocka.c b/src/cmocka.c
index 72f4c74..52897e1 100644
--- a/src/cmocka.c
+++ b/src/cmocka.c
@@ -256,8 +256,6 @@ static enum cm_message_output cm_get_output(void);
static int cm_error_message_enabled = 1;
static CMOCKA_THREAD char *cm_error_message;
-void cm_print_error(const char * const format, ...) CMOCKA_PRINTF_ATTRIBUTE(1, 2);
-
/*
* Keeps track of the calling context returned by setenv() so that the fail()
* method can jump out of a test.