Commit 77d7e5eb by Patrick Steinhardt

clar: use `size_t` to keep track of current line number

We use the `__LINE__` macro in several places throughout clar to allow
easier traceability when e.g. a test fails. While `__LINE__` is of type
`size_t`, the clar functions all accept an integer and thus may loose
precision. While unlikely that any file in our codebase will exceed a
linecount of `INT_MAX`, let's convert it anyway to silence any compiler
warnings.
parent 2dea4736
...@@ -96,7 +96,7 @@ fixture_path(const char *base, const char *fixture_name); ...@@ -96,7 +96,7 @@ fixture_path(const char *base, const char *fixture_name);
struct clar_error { struct clar_error {
const char *file; const char *file;
int line_number; size_t line_number;
const char *error_msg; const char *error_msg;
char *description; char *description;
...@@ -589,7 +589,7 @@ void clar__skip(void) ...@@ -589,7 +589,7 @@ void clar__skip(void)
void clar__fail( void clar__fail(
const char *file, const char *file,
int line, size_t line,
const char *error_msg, const char *error_msg,
const char *description, const char *description,
int should_abort) int should_abort)
...@@ -621,7 +621,7 @@ void clar__fail( ...@@ -621,7 +621,7 @@ void clar__fail(
void clar__assert( void clar__assert(
int condition, int condition,
const char *file, const char *file,
int line, size_t line,
const char *error_msg, const char *error_msg,
const char *description, const char *description,
int should_abort) int should_abort)
...@@ -634,7 +634,7 @@ void clar__assert( ...@@ -634,7 +634,7 @@ void clar__assert(
void clar__assert_equal( void clar__assert_equal(
const char *file, const char *file,
int line, size_t line,
const char *err, const char *err,
int should_abort, int should_abort,
const char *fmt, const char *fmt,
......
...@@ -141,7 +141,7 @@ void clar__skip(void); ...@@ -141,7 +141,7 @@ void clar__skip(void);
void clar__fail( void clar__fail(
const char *file, const char *file,
int line, size_t line,
const char *error, const char *error,
const char *description, const char *description,
int should_abort); int should_abort);
...@@ -149,14 +149,14 @@ void clar__fail( ...@@ -149,14 +149,14 @@ void clar__fail(
void clar__assert( void clar__assert(
int condition, int condition,
const char *file, const char *file,
int line, size_t line,
const char *error, const char *error,
const char *description, const char *description,
int should_abort); int should_abort);
void clar__assert_equal( void clar__assert_equal(
const char *file, const char *file,
int line, size_t line,
const char *err, const char *err,
int should_abort, int should_abort,
const char *fmt, const char *fmt,
......
...@@ -20,7 +20,7 @@ static void clar_print_error(int num, const struct clar_report *report, const st ...@@ -20,7 +20,7 @@ static void clar_print_error(int num, const struct clar_report *report, const st
{ {
printf(" %d) Failure:\n", num); printf(" %d) Failure:\n", num);
printf("%s::%s [%s:%d]\n", printf("%s::%s [%s:%"PRIuZ"]\n",
report->suite, report->suite,
report->test, report->test,
error->file, error->file,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment