X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftap%2Ftap.c;h=857528a24429fa12e438e6844f356fa6fee40513;hp=0eaec9a5f852827d879553cfd50cd8bdf252f2c6;hb=b734bbea227ae0c326a0f19f84b490d8895b2010;hpb=2c2612e5cd37c582a8269699887e1e87df399c7b diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c index 0eaec9a5..857528a2 100644 --- a/ccan/tap/tap.c +++ b/ccan/tap/tap.c @@ -42,7 +42,7 @@ static unsigned int test_count = 0; /* Number of tests that have been run */ static unsigned int e_tests = 0; /* Expected number of tests to run */ static unsigned int failures = 0; /* Number of tests that failed */ static char *todo_msg = NULL; -static char *todo_msg_fixed = "libtap malloc issue"; +static const char *todo_msg_fixed = "libtap malloc issue"; static int todo = 0; static int test_died = 0; static int test_pid; @@ -68,7 +68,7 @@ _expected_tests(unsigned int tests) } static void -diagv(char *fmt, va_list ap) +diagv(const char *fmt, va_list ap) { fputs("# ", stdout); vfprintf(stdout, fmt, ap); @@ -76,7 +76,7 @@ diagv(char *fmt, va_list ap) } static void -_diag(char *fmt, ...) +_diag(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -92,8 +92,8 @@ _diag(char *fmt, ...) * test_comment -- a comment to print afterwards, may be NULL */ unsigned int -_gen_result(int ok, const char *func, char *file, unsigned int line, - char *test_name, ...) +_gen_result(int ok, const char *func, const char *file, unsigned int line, + const char *test_name, ...) { va_list ap; char *local_test_name = NULL; @@ -260,7 +260,7 @@ _tap_init(void) /* stdout needs to be unbuffered so that the output appears in the same place relative to stderr output as it does with Test::Harness */ - setbuf(stdout, 0); +// setbuf(stdout, 0); run_once = 1; } } @@ -293,7 +293,7 @@ plan_no_plan(void) * Note that the plan is to skip all tests */ void -plan_skip_all(char *reason) +plan_skip_all(const char *reason) { LOCK; @@ -345,7 +345,7 @@ plan_tests(unsigned int tests) } void -diag(char *fmt, ...) +diag(const char *fmt, ...) { va_list ap; @@ -359,7 +359,7 @@ diag(char *fmt, ...) } void -skip(unsigned int n, char *fmt, ...) +skip(unsigned int n, const char *fmt, ...) { va_list ap; char *skip_msg; @@ -384,7 +384,7 @@ skip(unsigned int n, char *fmt, ...) } void -todo_start(char *fmt, ...) +todo_start(const char *fmt, ...) { va_list ap;