streams: make file-local functions static

pks-t · ethomson · commit 193e7ce979c2 · 2019-01-31T13:34:14.000Z
The callback functions that implement the `git_stream` structure are
only used inside of their respective implementation files, but they are
not marked as `static`. Fix this.
diff --git a/src/streams/mbedtls.c b/src/streams/mbedtls.c
@@ -246,7 +246,7 @@ typedef struct {
 } mbedtls_stream;
 
 
-int mbedtls_connect(git_stream *stream)
+static int mbedtls_connect(git_stream *stream)
 {
 	int ret;
 	mbedtls_stream *st = (mbedtls_stream *) stream;
@@ -266,7 +266,7 @@ int mbedtls_connect(git_stream *stream)
 	return verify_server_cert(st->ssl);
 }
 
-int mbedtls_certificate(git_cert **out, git_stream *stream)
+static int mbedtls_certificate(git_cert **out, git_stream *stream)
 {
 	unsigned char *encoded_cert;
 	mbedtls_stream *st = (mbedtls_stream *) stream;
@@ -303,7 +303,7 @@ static int mbedtls_set_proxy(git_stream *stream, const git_proxy_options *proxy_
 	return git_stream_set_proxy(st->io, proxy_options);
 }
 
-ssize_t mbedtls_stream_write(git_stream *stream, const char *data, size_t data_len, int flags)
+static ssize_t mbedtls_stream_write(git_stream *stream, const char *data, size_t data_len, int flags)
 {
 	ssize_t written = 0, len = min(data_len, SSIZE_MAX);
 	mbedtls_stream *st = (mbedtls_stream *) stream;
@@ -321,7 +321,7 @@ ssize_t mbedtls_stream_write(git_stream *stream, const char *data, size_t data_l
 	return written;
 }
 
-ssize_t mbedtls_stream_read(git_stream *stream, void *data, size_t len)
+static ssize_t mbedtls_stream_read(git_stream *stream, void *data, size_t len)
 {
 	mbedtls_stream *st = (mbedtls_stream *) stream;
 	int ret;
@@ -332,7 +332,7 @@ ssize_t mbedtls_stream_read(git_stream *stream, void *data, size_t len)
 	return ret;
 }
 
-int mbedtls_stream_close(git_stream *stream)
+static int mbedtls_stream_close(git_stream *stream)
 {
 	mbedtls_stream *st = (mbedtls_stream *) stream;
 	int ret = 0;
@@ -345,7 +345,7 @@ int mbedtls_stream_close(git_stream *stream)
 	return st->owned ? git_stream_close(st->io) : 0;
 }
 
-void mbedtls_stream_free(git_stream *stream)
+static void mbedtls_stream_free(git_stream *stream)
 {
 	mbedtls_stream *st = (mbedtls_stream *) stream;
 
diff --git a/src/streams/openssl.c b/src/streams/openssl.c
@@ -572,9 +572,7 @@ typedef struct {
 	git_cert_x509 cert_info;
 } openssl_stream;
 
-int openssl_close(git_stream *stream);
-
-int openssl_connect(git_stream *stream)
+static int openssl_connect(git_stream *stream)
 {
 	int ret;
 	BIO *bio;
@@ -602,7 +600,7 @@ int openssl_connect(git_stream *stream)
 	return verify_server_cert(st->ssl, st->host);
 }
 
-int openssl_certificate(git_cert **out, git_stream *stream)
+static int openssl_certificate(git_cert **out, git_stream *stream)
 {
 	openssl_stream *st = (openssl_stream *) stream;
 	int len;
@@ -644,7 +642,7 @@ static int openssl_set_proxy(git_stream *stream, const git_proxy_options *proxy_
 	return git_stream_set_proxy(st->io, proxy_opts);
 }
 
-ssize_t openssl_write(git_stream *stream, const char *data, size_t data_len, int flags)
+static ssize_t openssl_write(git_stream *stream, const char *data, size_t data_len, int flags)
 {
 	openssl_stream *st = (openssl_stream *) stream;
 	int ret, len = min(data_len, INT_MAX);
@@ -658,7 +656,7 @@ ssize_t openssl_write(git_stream *stream, const char *data, size_t data_len, int
 	return ret;
 }
 
-ssize_t openssl_read(git_stream *stream, void *data, size_t len)
+static ssize_t openssl_read(git_stream *stream, void *data, size_t len)
 {
 	openssl_stream *st = (openssl_stream *) stream;
 	int ret;
@@ -669,7 +667,7 @@ ssize_t openssl_read(git_stream *stream, void *data, size_t len)
 	return ret;
 }
 
-int openssl_close(git_stream *stream)
+static int openssl_close(git_stream *stream)
 {
 	openssl_stream *st = (openssl_stream *) stream;
 	int ret;
@@ -682,7 +680,7 @@ int openssl_close(git_stream *stream)
 	return st->owned ? git_stream_close(st->io) : 0;
 }
 
-void openssl_free(git_stream *stream)
+static void openssl_free(git_stream *stream)
 {
 	openssl_stream *st = (openssl_stream *) stream;
 
diff --git a/src/streams/socket.c b/src/streams/socket.c
@@ -69,7 +69,7 @@ static int close_socket(GIT_SOCKET s)
 
 }
 
-int socket_connect(git_stream *stream)
+static int socket_connect(git_stream *stream)
 {
 	struct addrinfo *info = NULL, *p;
 	struct addrinfo hints;
@@ -130,7 +130,7 @@ int socket_connect(git_stream *stream)
 	return 0;
 }
 
-ssize_t socket_write(git_stream *stream, const char *data, size_t data_len, int flags)
+static ssize_t socket_write(git_stream *stream, const char *data, size_t data_len, int flags)
 {
 	ssize_t ret, off = 0, len = min(data_len, SSIZE_MAX);
 	git_socket_stream *st = (git_socket_stream *) stream;
@@ -149,7 +149,7 @@ ssize_t socket_write(git_stream *stream, const char *data, size_t data_len, int
 	return off;
 }
 
-ssize_t socket_read(git_stream *stream, void *data, size_t len)
+static ssize_t socket_read(git_stream *stream, void *data, size_t len)
 {
 	ssize_t ret;
 	git_socket_stream *st = (git_socket_stream *) stream;
@@ -160,7 +160,7 @@ ssize_t socket_read(git_stream *stream, void *data, size_t len)
 	return ret;
 }
 
-int socket_close(git_stream *stream)
+static int socket_close(git_stream *stream)
 {
 	git_socket_stream *st = (git_socket_stream *) stream;
 	int error;
@@ -171,7 +171,7 @@ int socket_close(git_stream *stream)
 	return error;
 }
 
-void socket_free(git_stream *stream)
+static void socket_free(git_stream *stream)
 {
 	git_socket_stream *st = (git_socket_stream *) stream;
 

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ typedef struct {`
`246`	`246`	`} mbedtls_stream;`
`247`	`247`
`248`	`248`
`249`		`-int mbedtls_connect(git_stream *stream)`
	`249`	`+static int mbedtls_connect(git_stream *stream)`
`250`	`250`	`{`
`251`	`251`	`int ret;`
`252`	`252`	`mbedtls_stream st = (mbedtls_stream ) stream;`
`@@ -266,7 +266,7 @@ int mbedtls_connect(git_stream *stream)`
`266`	`266`	`return verify_server_cert(st->ssl);`
`267`	`267`	`}`
`268`	`268`
`269`		`-int mbedtls_certificate(git_cert *out, git_stream stream)`
	`269`	`+static int mbedtls_certificate(git_cert *out, git_stream stream)`
`270`	`270`	`{`
`271`	`271`	`unsigned char *encoded_cert;`
`272`	`272`	`mbedtls_stream st = (mbedtls_stream ) stream;`
`@@ -303,7 +303,7 @@ static int mbedtls_set_proxy(git_stream stream, const git_proxy_options proxy_`
`303`	`303`	`return git_stream_set_proxy(st->io, proxy_options);`
`304`	`304`	`}`
`305`	`305`
`306`		`-ssize_t mbedtls_stream_write(git_stream stream, const char data, size_t data_len, int flags)`
	`306`	`+static ssize_t mbedtls_stream_write(git_stream stream, const char data, size_t data_len, int flags)`
`307`	`307`	`{`
`308`	`308`	`ssize_t written = 0, len = min(data_len, SSIZE_MAX);`
`309`	`309`	`mbedtls_stream st = (mbedtls_stream ) stream;`
`@@ -321,7 +321,7 @@ ssize_t mbedtls_stream_write(git_stream stream, const char data, size_t data_l`
`321`	`321`	`return written;`
`322`	`322`	`}`
`323`	`323`
`324`		`-ssize_t mbedtls_stream_read(git_stream stream, void data, size_t len)`
	`324`	`+static ssize_t mbedtls_stream_read(git_stream stream, void data, size_t len)`
`325`	`325`	`{`
`326`	`326`	`mbedtls_stream st = (mbedtls_stream ) stream;`
`327`	`327`	`int ret;`
`@@ -332,7 +332,7 @@ ssize_t mbedtls_stream_read(git_stream stream, void data, size_t len)`
`332`	`332`	`return ret;`
`333`	`333`	`}`
`334`	`334`
`335`		`-int mbedtls_stream_close(git_stream *stream)`
	`335`	`+static int mbedtls_stream_close(git_stream *stream)`
`336`	`336`	`{`
`337`	`337`	`mbedtls_stream st = (mbedtls_stream ) stream;`
`338`	`338`	`int ret = 0;`
`@@ -345,7 +345,7 @@ int mbedtls_stream_close(git_stream *stream)`
`345`	`345`	`return st->owned ? git_stream_close(st->io) : 0;`
`346`	`346`	`}`
`347`	`347`
`348`		`-void mbedtls_stream_free(git_stream *stream)`
	`348`	`+static void mbedtls_stream_free(git_stream *stream)`
`349`	`349`	`{`
`350`	`350`	`mbedtls_stream st = (mbedtls_stream ) stream;`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -572,9 +572,7 @@ typedef struct {`
`572`	`572`	`git_cert_x509 cert_info;`
`573`	`573`	`} openssl_stream;`
`574`	`574`
`575`		`-int openssl_close(git_stream *stream);`
`576`		`-`
`577`		`-int openssl_connect(git_stream *stream)`
	`575`	`+static int openssl_connect(git_stream *stream)`
`578`	`576`	`{`
`579`	`577`	`int ret;`
`580`	`578`	`BIO *bio;`
`@@ -602,7 +600,7 @@ int openssl_connect(git_stream *stream)`
`602`	`600`	`return verify_server_cert(st->ssl, st->host);`
`603`	`601`	`}`
`604`	`602`
`605`		`-int openssl_certificate(git_cert *out, git_stream stream)`
	`603`	`+static int openssl_certificate(git_cert *out, git_stream stream)`
`606`	`604`	`{`
`607`	`605`	`openssl_stream st = (openssl_stream ) stream;`
`608`	`606`	`int len;`
`@@ -644,7 +642,7 @@ static int openssl_set_proxy(git_stream stream, const git_proxy_options proxy_`
`644`	`642`	`return git_stream_set_proxy(st->io, proxy_opts);`
`645`	`643`	`}`
`646`	`644`
`647`		`-ssize_t openssl_write(git_stream stream, const char data, size_t data_len, int flags)`
	`645`	`+static ssize_t openssl_write(git_stream stream, const char data, size_t data_len, int flags)`
`648`	`646`	`{`
`649`	`647`	`openssl_stream st = (openssl_stream ) stream;`
`650`	`648`	`int ret, len = min(data_len, INT_MAX);`
`@@ -658,7 +656,7 @@ ssize_t openssl_write(git_stream stream, const char data, size_t data_len, int`
`658`	`656`	`return ret;`
`659`	`657`	`}`
`660`	`658`
`661`		`-ssize_t openssl_read(git_stream stream, void data, size_t len)`
	`659`	`+static ssize_t openssl_read(git_stream stream, void data, size_t len)`
`662`	`660`	`{`
`663`	`661`	`openssl_stream st = (openssl_stream ) stream;`
`664`	`662`	`int ret;`
`@@ -669,7 +667,7 @@ ssize_t openssl_read(git_stream stream, void data, size_t len)`
`669`	`667`	`return ret;`
`670`	`668`	`}`
`671`	`669`
`672`		`-int openssl_close(git_stream *stream)`
	`670`	`+static int openssl_close(git_stream *stream)`
`673`	`671`	`{`
`674`	`672`	`openssl_stream st = (openssl_stream ) stream;`
`675`	`673`	`int ret;`
`@@ -682,7 +680,7 @@ int openssl_close(git_stream *stream)`
`682`	`680`	`return st->owned ? git_stream_close(st->io) : 0;`
`683`	`681`	`}`
`684`	`682`
`685`		`-void openssl_free(git_stream *stream)`
	`683`	`+static void openssl_free(git_stream *stream)`
`686`	`684`	`{`
`687`	`685`	`openssl_stream st = (openssl_stream ) stream;`
`688`	`686`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ static int close_socket(GIT_SOCKET s)`
`69`	`69`
`70`	`70`	`}`
`71`	`71`
`72`		`-int socket_connect(git_stream *stream)`
	`72`	`+static int socket_connect(git_stream *stream)`
`73`	`73`	`{`
`74`	`74`	`struct addrinfo info = NULL, p;`
`75`	`75`	`struct addrinfo hints;`
`@@ -130,7 +130,7 @@ int socket_connect(git_stream *stream)`
`130`	`130`	`return 0;`
`131`	`131`	`}`
`132`	`132`
`133`		`-ssize_t socket_write(git_stream stream, const char data, size_t data_len, int flags)`
	`133`	`+static ssize_t socket_write(git_stream stream, const char data, size_t data_len, int flags)`
`134`	`134`	`{`
`135`	`135`	`ssize_t ret, off = 0, len = min(data_len, SSIZE_MAX);`
`136`	`136`	`git_socket_stream st = (git_socket_stream ) stream;`
`@@ -149,7 +149,7 @@ ssize_t socket_write(git_stream stream, const char data, size_t data_len, int`
`149`	`149`	`return off;`
`150`	`150`	`}`
`151`	`151`
`152`		`-ssize_t socket_read(git_stream stream, void data, size_t len)`
	`152`	`+static ssize_t socket_read(git_stream stream, void data, size_t len)`
`153`	`153`	`{`
`154`	`154`	`ssize_t ret;`
`155`	`155`	`git_socket_stream st = (git_socket_stream ) stream;`
`@@ -160,7 +160,7 @@ ssize_t socket_read(git_stream stream, void data, size_t len)`
`160`	`160`	`return ret;`
`161`	`161`	`}`
`162`	`162`
`163`		`-int socket_close(git_stream *stream)`
	`163`	`+static int socket_close(git_stream *stream)`
`164`	`164`	`{`
`165`	`165`	`git_socket_stream st = (git_socket_stream ) stream;`
`166`	`166`	`int error;`
`@@ -171,7 +171,7 @@ int socket_close(git_stream *stream)`
`171`	`171`	`return error;`
`172`	`172`	`}`
`173`	`173`
`174`		`-void socket_free(git_stream *stream)`
	`174`	`+static void socket_free(git_stream *stream)`
`175`	`175`	`{`
`176`	`176`	`git_socket_stream st = (git_socket_stream ) stream;`
`177`	`177`