stream: Gather streams to src/streams

src/CMakeLists.txt

@@ -320,7 +320,10 @@ ELSE()
 	ENDIF()
 	FILE(GLOB SRC_OS unix/*.c unix/*.h)
 ENDIF()
-FILE(GLOB SRC_GIT2 *.c *.h transports/*.c transports/*.h xdiff/*.c xdiff/*.h)
+FILE(GLOB SRC_GIT2 *.c *.h
+	streams/*.c streams/*.h
+	transports/*.c transports/*.h
+	xdiff/*.c xdiff/*.h)
 
 # Determine architecture of the machine
 IF (CMAKE_SIZEOF_VOID_P EQUAL 8)

src/global.c

@@ -11,7 +11,7 @@
 #include "sysdir.h"
 #include "filter.h"
 #include "merge_driver.h"
-#include "openssl_stream.h"
+#include "streams/openssl.h"
 #include "thread-utils.h"
 #include "git2/global.h"
 #include "transports/ssh.h"

src/curl_stream.c → src/streams/curl.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "curl_stream.h"
+#include "streams/curl.h"
 
 #ifdef GIT_CURL
 

src/curl_stream.h → src/streams/curl.h

@@ -4,8 +4,8 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#ifndef INCLUDE_curl_stream_h__
-#define INCLUDE_curl_stream_h__
+#ifndef INCLUDE_streams_curl_h__
+#define INCLUDE_streams_curl_h__
 
 #include "common.h"
 

src/openssl_stream.c → src/streams/openssl.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "openssl_stream.h"
+#include "streams/openssl.h"
 
 #ifdef GIT_OPENSSL
 
@@ -14,13 +14,13 @@
 #include "global.h"
 #include "posix.h"
 #include "stream.h"
-#include "socket_stream.h"
+#include "streams/socket.h"
 #include "netops.h"
 #include "git2/transport.h"
 #include "git2/sys/openssl.h"
 
 #ifdef GIT_CURL
-# include "curl_stream.h"
+# include "streams/curl.h"
 #endif
 
 #ifndef GIT_WIN32

src/openssl_stream.h → src/streams/openssl.h

@@ -4,8 +4,8 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#ifndef INCLUDE_openssl_stream_h__
-#define INCLUDE_openssl_stream_h__
+#ifndef INCLUDE_streams_openssl_h__
+#define INCLUDE_streams_openssl_h__
 
 #include "common.h"
 

src/socket_stream.c → src/streams/socket.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "socket_stream.h"
+#include "streams/socket.h"
 
 #include "posix.h"
 #include "netops.h"

src/socket_stream.h → src/streams/socket.h

@@ -4,8 +4,8 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#ifndef INCLUDE_socket_stream_h__
-#define INCLUDE_socket_stream_h__
+#ifndef INCLUDE_streams_socket_h__
+#define INCLUDE_streams_socket_h__
 
 #include "common.h"
 

src/stransport_stream.c → src/streams/stransport.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "stransport_stream.h"
+#include "streams/stransport.h"
 
 #ifdef GIT_SECURE_TRANSPORT
 
@@ -15,8 +15,8 @@
 
 #include "git2/transport.h"
 
-#include "socket_stream.h"
-#include "curl_stream.h"
+#include "streams/socket.h"
+#include "streams/curl.h"
 
 static int stransport_error(OSStatus ret)
 {

src/stransport_stream.h → src/streams/stransport.h

@@ -4,8 +4,8 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#ifndef INCLUDE_stransport_stream_h__
-#define INCLUDE_stransport_stream_h__
+#ifndef INCLUDE_streams_stransport_h__
+#define INCLUDE_streams_stransport_h__
 
 #include "common.h"
 

src/tls_stream.c → src/streams/tls.c

@@ -5,12 +5,12 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "tls_stream.h"
+#include "streams/tls.h"
 
 #include "git2/errors.h"
 
-#include "openssl_stream.h"
-#include "stransport_stream.h"
+#include "streams/openssl.h"
+#include "streams/stransport.h"
 
 static git_stream_cb tls_ctor;
 

src/tls_stream.h → src/streams/tls.h

@@ -4,8 +4,8 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#ifndef INCLUDE_tls_stream_h__
-#define INCLUDE_tls_stream_h__
+#ifndef INCLUDE_streams_tls_h__
+#define INCLUDE_streams_tls_h__
 
 #include "common.h"
 

src/transports/git.c

@@ -12,7 +12,7 @@
 #include "netops.h"
 #include "git2/sys/transport.h"
 #include "stream.h"
-#include "socket_stream.h"
+#include "streams/socket.h"
 
 #define OWNING_SUBTRANSPORT(s) ((git_subtransport *)(s)->parent.subtransport)
 

src/transports/http.c

@@ -18,9 +18,9 @@
 #include "smart.h"
 #include "auth.h"
 #include "auth_negotiate.h"
-#include "tls_stream.h"
-#include "socket_stream.h"
-#include "curl_stream.h"
+#include "streams/tls.h"
+#include "streams/socket.h"
+#include "streams/curl.h"
 
 git_http_auth_scheme auth_schemes[] = {
 	{ GIT_AUTHTYPE_NEGOTIATE, "Negotiate", GIT_CREDTYPE_DEFAULT, git_http_auth_negotiate },

src/transports/ssh.c

@@ -17,7 +17,7 @@
 #include "netops.h"
 #include "smart.h"
 #include "cred.h"
-#include "socket_stream.h"
+#include "streams/socket.h"
 
 #ifdef GIT_SSH
 

tests/core/stream.c

 #include "clar_libgit2.h"
 #include "git2/sys/stream.h"
-#include "tls_stream.h"
+#include "streams/tls.h"
 #include "stream.h"
 
 static git_stream test_stream;