X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftap%2Ftap.c;h=5c475bcce97cd7232ca7a950fc0ceba20ada533b;hp=6e268324446b7d1e33a7953005306b971ba1cf4b;hb=04160dbda10c78fbd4ee452d0af89d540e20b09a;hpb=30d3e635ecef7961777a1aa98b1bde23712d6547 diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c index 6e268324..5c475bcc 100644 --- a/ccan/tap/tap.c +++ b/ccan/tap/tap.c @@ -67,9 +67,9 @@ _expected_tests(unsigned int tests) static void diagv(char *fmt, va_list ap) { - fputs("# ", stderr); - vfprintf(stderr, fmt, ap); - fputs("\n", stderr); + fputs("# ", stdout); + vfprintf(stdout, fmt, ap); + fputs("\n", stdout); } static void @@ -105,7 +105,8 @@ _gen_result(int ok, const char *func, char *file, unsigned int line, expansions on it */ if(test_name != NULL) { va_start(ap, test_name); - vasprintf(&local_test_name, test_name, ap); + if (vasprintf(&local_test_name, test_name, ap) < 0) + local_test_name = NULL; va_end(ap); /* Make sure the test name contains more than digits @@ -363,7 +364,8 @@ skip(unsigned int n, char *fmt, ...) LOCK; va_start(ap, fmt); - vasprintf(&skip_msg, fmt, ap); + if (vasprintf(&skip_msg, fmt, ap) < 0) + skip_msg = NULL; va_end(ap); while(n-- > 0) { @@ -386,7 +388,8 @@ todo_start(char *fmt, ...) LOCK; va_start(ap, fmt); - vasprintf(&todo_msg, fmt, ap); + if (vasprintf(&todo_msg, fmt, ap) < 0) + todo_msg = NULL; va_end(ap); todo = 1;