stream: Gather streams to src/streams

16 files changed, 32 insertions, 29 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bbdbfdb74..bb5031366 100644
--- a/src/CMakeLists.txt
+++ b/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)
diff --git a/src/global.c b/src/global.c
index c6847a4d2..89183080b 100644
--- a/src/global.c
+++ b/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"
diff --git a/src/curl_stream.c b/src/streams/curl.c
index a895cb8bd..2f0610389 100644
--- a/src/curl_stream.c
+++ b/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
 
diff --git a/src/curl_stream.h b/src/streams/curl.h
index debade7e2..548feae2f 100644
--- a/src/curl_stream.h
+++ b/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"
 
diff --git a/src/openssl_stream.c b/src/streams/openssl.c
index 3860c4f3c..550b4e10b 100644
--- a/src/openssl_stream.c
+++ b/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
diff --git a/src/openssl_stream.h b/src/streams/openssl.h
index 2dcfcc929..202f5674c 100644
--- a/src/openssl_stream.h
+++ b/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"
 
diff --git a/src/socket_stream.c b/src/streams/socket.c
index 3c2a07c02..0c6073b66 100644
--- a/src/socket_stream.c
+++ b/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"
diff --git a/src/socket_stream.h b/src/streams/socket.h
index 1f9ff78d1..3235f3167 100644
--- a/src/socket_stream.h
+++ b/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"
 
diff --git a/src/stransport_stream.c b/src/streams/stransport.c
index 18371ef92..64a5dd76f 100644
--- a/src/stransport_stream.c
+++ b/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)
 {
diff --git a/src/stransport_stream.h b/src/streams/stransport.h
index f5bbfd952..4c02d07e8 100644
--- a/src/stransport_stream.h
+++ b/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"
 
diff --git a/src/tls_stream.c b/src/streams/tls.c
index fefb92f26..d6ca7d40d 100644
--- a/src/tls_stream.c
+++ b/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;
 
diff --git a/src/tls_stream.h b/src/streams/tls.h
index 8971f7efc..6d110e8ad 100644
--- a/src/tls_stream.h
+++ b/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"
 
diff --git a/src/transports/git.c b/src/transports/git.c
index e019878b5..94178f2c5 100644
--- a/src/transports/git.c
+++ b/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)
 
diff --git a/src/transports/http.c b/src/transports/http.c
index 332e6280b..095cfdf2f 100644
--- a/src/transports/http.c
+++ b/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 },
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
index 47d328c41..9c00561f6 100644
--- a/src/transports/ssh.c
+++ b/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
 
diff --git a/tests/core/stream.c b/tests/core/stream.c
index 2da4b2f9b..9bed4ae27 100644
--- a/tests/core/stream.c
+++ b/tests/core/stream.c
@@ -1,6 +1,6 @@
 #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;