From ae76e4106345035503466bf9dcfa3b0033a526c6 Mon Sep 17 00:00:00 2001 From: Gediminas Jakutis Date: Thu, 24 Oct 2019 17:06:52 +0300 Subject: diagnostic: implement printing function's name. Signed-off-by: Gediminas Jakutis --- test/diagnostic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/diagnostic.c b/test/diagnostic.c index 0252771..35866df 100644 --- a/test/diagnostic.c +++ b/test/diagnostic.c @@ -42,7 +42,7 @@ static int clean_test(void); static struct stdiocap capture_stdio_start(FILE *stream); static void capture_stdio_stop(struct stdiocap *cap); static char *visible_newlines(const char * const in); -static int test_default_channels(const char * const in, const char * const expected, size_t i, int usearg, void (*func)(const char *, ...)); +static int test_default_channels(const char * const in, const char * const expected, size_t i, int usearg, void (*func)(const char *, const char *, ...)); int diagnostic_test(char *testname) { @@ -76,7 +76,7 @@ static int err_test(void) for (i = 0; i < arrlen(in); ++i) { usearg = i < (arrlen(in) / 2) ? 0 : 1; - ret = test_default_channels(in[i], expected[i], i, usearg, rin_err); + ret = test_default_channels(in[i], expected[i], i, usearg, __rin_err); } return ret; @@ -93,7 +93,7 @@ static int warn_test(void) for (i = 0; i < arrlen(in); ++i) { usearg = i < (arrlen(in) / 2) ? 0 : 1; - ret = test_default_channels(in[i], expected[i], i, usearg, rin_warn); + ret = test_default_channels(in[i], expected[i], i, usearg, __rin_warn); } return ret; @@ -110,7 +110,7 @@ static int fixme_test(void) for (i = 0; i < arrlen(in); ++i) { usearg = i < (arrlen(in) / 2) ? 0 : 1; - ret = test_default_channels(in[i], expected[i], i, usearg, rin_fixme); + ret = test_default_channels(in[i], expected[i], i, usearg, __rin_fixme); } return ret; @@ -130,7 +130,7 @@ static int info_test(void) for (i = 0; i < arrlen(in); ++i) { usearg = i < (arrlen(in) / 2) ? 0 : 1; - ret = test_default_channels(in[i], expected[i], i, usearg, rin_info); + ret = test_default_channels(in[i], expected[i], i, usearg, __rin_info); } /* restore the default, kind of */ @@ -221,7 +221,7 @@ static char *visible_newlines(const char * const in) return ret; } -static int test_default_channels(const char * const in, const char * const expected, size_t i, int usearg, void (*func)(const char *, ...)) +static int test_default_channels(const char * const in, const char * const expected, size_t i, int usearg, void (*func)(const char *, const char *, ...)) { char buf[32] = {0}; struct stdiocap cap; @@ -239,9 +239,9 @@ static int test_default_channels(const char * const in, const char * const expec } if (usearg) { - func(in, i + 1); + func(NULL, in, i + 1); } else { - func(in); + func(NULL, in); } if (!(fgets(buf, sizeof(buf) < len ? sizeof(buf) : len, cap.pipe))) { -- cgit v1.2.3