tests: constify format strings in tap.h

[babeltrace.git] / tests / utils / tap / tap.c

diff --git a/tests/utils/tap/tap.c b/tests/utils/tap/tap.c
index d3d3f3df8a4db955eea39d225f4c9c7ed13a800a..a5c3a8109c8e279542d73f083cb5802a214c5bab 100644 (file)
--- a/tests/utils/tap/tap.c
+++ b/tests/utils/tap/tap.c
@@ -29,9 +29,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <babeltrace/assert-internal.h>
 #include <string.h>
 #include <limits.h>
+#include <assert.h>
 
 #include "tap.h"
 
@@ -82,8 +82,8 @@ void funlockfile(FILE * filehandle) {
  * 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;
@@ -228,7 +228,7 @@ plan_no_plan(void)
  * Note that the plan is to skip all tests
  */
 int
-plan_skip_all(char *reason)
+plan_skip_all(const char *reason)
 {
 
        LOCK;
@@ -284,7 +284,7 @@ plan_tests(unsigned int tests)
 }
 
 unsigned int
-diag(char *fmt, ...)
+diag(const char *fmt, ...)
 {
        va_list ap;
 
@@ -304,7 +304,7 @@ diag_multiline(const char *val)
 {
        size_t len, i, line_start_idx = 0;
 
-       BT_ASSERT(val);
+       assert(val);
        len = strlen(val);
 
        for (i = 0; i < len; i++) {
@@ -314,7 +314,7 @@ diag_multiline(const char *val)
                        continue;
                }
 
-               BT_ASSERT((i - line_start_idx + 1) <= INT_MAX);
+               assert((i - line_start_idx + 1) <= INT_MAX);
                line_length = i - line_start_idx + 1;
                fprintf(stderr, "# %.*s", line_length, &val[line_start_idx]);
                line_start_idx = i + 1;
@@ -330,7 +330,7 @@ _expected_tests(unsigned int tests)
 }
 
 int
-skip(unsigned int n, char *fmt, ...)
+skip(unsigned int n, const char *fmt, ...)
 {
        va_list ap;
        char *skip_msg = NULL;
@@ -358,7 +358,7 @@ skip(unsigned int n, char *fmt, ...)
 }
 
 void
-todo_start(char *fmt, ...)
+todo_start(const char *fmt, ...)
 {
        va_list ap;