aboutsummaryrefslogtreecommitdiffstats
path: root/test/diagnostic.c
diff options
context:
space:
mode:
authorGravatar Gediminas Jakutis <gediminas@varciai.lt> 2019-10-24 17:06:52 +0300
committerGravatar Gediminas Jakutis <gediminas@varciai.lt> 2019-10-24 17:06:52 +0300
commitae76e4106345035503466bf9dcfa3b0033a526c6 (patch)
tree50ebddc83138785ec775aeb8e1c7ac06c7395706 /test/diagnostic.c
parent84cec7dc2c645e4d1bbab8e8496c4f6cd9562989 (diff)
downloadlibrin-ae76e4106345035503466bf9dcfa3b0033a526c6.tar.gz
librin-ae76e4106345035503466bf9dcfa3b0033a526c6.tar.bz2
librin-ae76e4106345035503466bf9dcfa3b0033a526c6.zip
diagnostic: implement printing function's name.
Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>
Diffstat (limited to 'test/diagnostic.c')
-rw-r--r--test/diagnostic.c16
1 files changed, 8 insertions, 8 deletions
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))) {