Merge pull request #6480 from libgit2/ethomson/warn

ethomson · web-flow · commit cefe6c456230 · 2023-02-15T13:57:09.000Z
Fix some warnings in main
diff --git a/src/libgit2/streams/socket.c b/src/libgit2/streams/socket.c
@@ -135,7 +135,8 @@ static ssize_t socket_write(git_stream *stream, const char *data, size_t len, in
 	git_socket_stream *st = (git_socket_stream *) stream;
 	ssize_t written;
 
-	assert(flags == 0);
+	GIT_ASSERT(flags == 0);
+	GIT_UNUSED(flags);
 
 	errno = 0;
 
diff --git a/tests/libgit2/repo/extensions.c b/tests/libgit2/repo/extensions.c
@@ -3,7 +3,7 @@
 #include "sysdir.h"
 #include <ctype.h>
 
-git_repository *repo;
+static git_repository *repo;
 
 void test_repo_extensions__initialize(void)
 {
diff --git a/tests/libgit2/repo/objectformat.c b/tests/libgit2/repo/objectformat.c
@@ -4,8 +4,8 @@
 #include "repository.h"
 #include <ctype.h>
 
-git_repository *repo;
-git_config *config;
+static git_repository *repo;
+static git_config *config;
 
 void test_repo_objectformat__initialize(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include "sysdir.h"`
`4`	`4`	`#include <ctype.h>`
`5`	`5`
`6`		`-git_repository *repo;`
	`6`	`+static git_repository *repo;`
`7`	`7`
`8`	`8`	`void test_repo_extensions__initialize(void)`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`#include "repository.h"`
`5`	`5`	`#include <ctype.h>`
`6`	`6`
`7`		`-git_repository *repo;`
`8`		`-git_config *config;`
	`7`	`+static git_repository *repo;`
	`8`	`+static git_config *config;`
`9`	`9`
`10`	`10`	`void test_repo_objectformat__initialize(void)`
`11`	`11`	`{`