Merge pull request #5143 from libgit2/ethomson/warnings

ci: build with ENABLE_WERROR on Windows

4 files changed, 9 insertions, 9 deletions

diff --git a/tests/clar.c b/tests/clar.c
index 459ece0a1..7c308dd34 100644
--- a/tests/clar.c
+++ b/tests/clar.c
@@ -96,7 +96,7 @@ fixture_path(const char *base, const char *fixture_name);
 
 struct clar_error {
 	const char *file;
-	int line_number;
+	size_t line_number;
 	const char *error_msg;
 	char *description;
 
@@ -589,7 +589,7 @@ void clar__skip(void)
 
 void clar__fail(
 	const char *file,
-	int line,
+	size_t line,
 	const char *error_msg,
 	const char *description,
 	int should_abort)
@@ -621,7 +621,7 @@ void clar__fail(
 void clar__assert(
 	int condition,
 	const char *file,
-	int line,
+	size_t line,
 	const char *error_msg,
 	const char *description,
 	int should_abort)
@@ -634,7 +634,7 @@ void clar__assert(
 
 void clar__assert_equal(
 	const char *file,
-	int line,
+	size_t line,
 	const char *err,
 	int should_abort,
 	const char *fmt,
diff --git a/tests/clar.h b/tests/clar.h
index 2f9f96b3f..20ff4c895 100644
--- a/tests/clar.h
+++ b/tests/clar.h
@@ -141,7 +141,7 @@ void clar__skip(void);
 
 void clar__fail(
 	const char *file,
-	int line,
+	size_t line,
 	const char *error,
 	const char *description,
 	int should_abort);
@@ -149,14 +149,14 @@ void clar__fail(
 void clar__assert(
 	int condition,
 	const char *file,
-	int line,
+	size_t line,
 	const char *error,
 	const char *description,
 	int should_abort);
 
 void clar__assert_equal(
 	const char *file,
-	int line,
+	size_t line,
 	const char *err,
 	int should_abort,
 	const char *fmt,
diff --git a/tests/clar/print.h b/tests/clar/print.h
index 73c4a8953..2e2b6202c 100644
--- a/tests/clar/print.h
+++ b/tests/clar/print.h
@@ -20,7 +20,7 @@ static void clar_print_error(int num, const struct clar_report *report, const st
 {
 	printf("  %d) Failure:\n", num);
 
-	printf("%s::%s [%s:%d]\n",
+	printf("%s::%s [%s:%"PRIuZ"]\n",
 		report->suite,
 		report->test,
 		error->file,
diff --git a/tests/trace/windows/stacktrace.c b/tests/trace/windows/stacktrace.c
index ca5760edd..756ac68a3 100644
--- a/tests/trace/windows/stacktrace.c
+++ b/tests/trace/windows/stacktrace.c
@@ -132,7 +132,7 @@ static void aux_cb_alloc__1(unsigned int *aux_id)
 	*aux_id = aux_counter++;
 }
 
-static void aux_cb_lookup__1(unsigned int aux_id, char *aux_msg, unsigned int aux_msg_len)
+static void aux_cb_lookup__1(unsigned int aux_id, char *aux_msg, size_t aux_msg_len)
 {
 	p_snprintf(aux_msg, aux_msg_len, "\tQQ%08x\n", aux_id);
 }