clang-format

19 files changed, 36 insertions, 31 deletions

diff --git a/zencore/include/zencore/logging.h b/zencore/include/zencore/logging.h
index 7a08cc48b..a2404a5e9 100644
--- a/zencore/include/zencore/logging.h
+++ b/zencore/include/zencore/logging.h
@@ -19,5 +19,4 @@ spdlog::logger& Get(std::string_view Name);
 void InitializeLogging();
 void ShutdownLogging();
 
-
 }  // namespace zen::logging
diff --git a/zencore/logging.cpp b/zencore/logging.cpp
index 89d588650..6441fc3bc 100644
--- a/zencore/logging.cpp
+++ b/zencore/logging.cpp
@@ -1,3 +1,5 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
 #include "zencore/logging.h"
 
 #include <spdlog/sinks/stdout_color_sinks.h>
@@ -42,12 +44,12 @@ ConsoleLog()
 	return *ConLogger;
 }
 
-void 
+void
 InitializeLogging()
 {
 }
 
-void 
+void
 ShutdownLogging()
 {
 	spdlog::drop_all();
diff --git a/zenhttp/httpnull.cpp b/zenhttp/httpnull.cpp
index 571c4241c..57cba13d3 100644
--- a/zenhttp/httpnull.cpp
+++ b/zenhttp/httpnull.cpp
@@ -1,7 +1,9 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
 #include "httpnull.h"
 
-#include <zencore/logging.h>
 #include <conio.h>
+#include <zencore/logging.h>
 
 namespace zen {
 
diff --git a/zenhttp/httpnull.h b/zenhttp/httpnull.h
index 9cec33c98..b15b1b123 100644
--- a/zenhttp/httpnull.h
+++ b/zenhttp/httpnull.h
@@ -1,13 +1,15 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
 #pragma once
 
-#include <zenhttp/httpserver.h>
 #include <zencore/thread.h>
+#include <zenhttp/httpserver.h>
 
 namespace zen {
 
 /**
  * @brief Null implementation of "http" server. Does nothing
-*/
+ */
 
 class HttpNullServer : public HttpServer
 {
diff --git a/zenhttp/httpserver.cpp b/zenhttp/httpserver.cpp
index 3999b3b6c..f281185b7 100644
--- a/zenhttp/httpserver.cpp
+++ b/zenhttp/httpserver.cpp
@@ -2,8 +2,8 @@
 
 #include <zenhttp/httpserver.h>
 
-#include "httpsys.h"
 #include "httpnull.h"
+#include "httpsys.h"
 
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarypackage.h>
diff --git a/zenhttp/httpsys.cpp b/zenhttp/httpsys.cpp
index be538e7f7..471a8f80a 100644
--- a/zenhttp/httpsys.cpp
+++ b/zenhttp/httpsys.cpp
@@ -7,8 +7,8 @@
 
 #if ZEN_WITH_HTTPSYS
 
-#include <conio.h>
-#pragma comment(lib, "httpapi.lib")
+#	include <conio.h>
+#	pragma comment(lib, "httpapi.lib")
 
 std::wstring
 UTF8_to_wstring(const char* in)
@@ -1219,12 +1219,12 @@ InitialRequestHandler::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesT
 }
 
 //////////////////////////////////////////////////////////////////////////
-// 
+//
 // HttpServer interface implementation
 //
 
 void
-HttpSysServer::Initialize(int BasePort) 
+HttpSysServer::Initialize(int BasePort)
 {
 	using namespace std::literals;
 
diff --git a/zenhttp/httpsys.h b/zenhttp/httpsys.h
index ec8964f13..7c4e303ce 100644
--- a/zenhttp/httpsys.h
+++ b/zenhttp/httpsys.h
@@ -1,3 +1,5 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
 #pragma once
 
 #include <zenhttp/httpserver.h>
@@ -5,7 +7,7 @@
 #ifndef ZEN_WITH_HTTPSYS
 #	if ZEN_PLATFORM_WINDOWS
 #		define ZEN_WITH_HTTPSYS 1
-#else
+#	else
 #		define ZEN_WITH_HTTPSYS 0
 #	endif
 #endif
diff --git a/zenhttp/include/zenhttp/zenhttp.h b/zenhttp/include/zenhttp/zenhttp.h
index da4f4cbe8..c6ec92e7c 100644
--- a/zenhttp/include/zenhttp/zenhttp.h
+++ b/zenhttp/include/zenhttp/zenhttp.h
@@ -1,3 +1,5 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
 #pragma once
 
 #include <zencore/zencore.h>
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index e71b7f730..791bf4946 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1383,11 +1383,7 @@ TEST_CASE("mesh.basic")
 class ZenServerTestHelper
 {
 public:
-	ZenServerTestHelper(std::string_view HelperId, int ServerCount)
-	: m_HelperId{HelperId}
-	, m_ServerCount{ServerCount}
-	{
-	}
+	ZenServerTestHelper(std::string_view HelperId, int ServerCount) : m_HelperId{HelperId}, m_ServerCount{ServerCount} {}
 	~ZenServerTestHelper() {}
 
 	void SpawnServers()
@@ -1464,7 +1460,7 @@ TEST_CASE("http.package")
 	Servers.SpawnServers();
 
 	ZenServerInstance& Instance = Servers.GetInstance(0);
-	const std::string BaseUri = Instance.GetBaseUri();
+	const std::string  BaseUri	= Instance.GetBaseUri();
 
 	{
 		cpr::Response r = cpr::Post(cpr::Url{"{}/testing/package"_format(BaseUri)}, cpr::Body{"yoyoyoyo"});
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 46f7cf86a..57def07b9 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -4,8 +4,8 @@
 #include <zencore/compactbinaryvalidation.h>
 #include <zencore/compress.h>
 #include <zencore/fmtutils.h>
-#include <zenhttp/httpserver.h>
 #include <zencore/timer.h>
+#include <zenhttp/httpserver.h>
 
 #include "structuredcache.h"
 #include "structuredcachestore.h"
diff --git a/zenserver/compute/apply.h b/zenserver/compute/apply.h
index d377e4735..695dc2e6e 100644
--- a/zenserver/compute/apply.h
+++ b/zenserver/compute/apply.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #include <zencore/compactbinary.h>
-#include <zenhttp/httpserver.h>
 #include <zencore/iohash.h>
 #include <zencore/logging.h>
+#include <zenhttp/httpserver.h>
 
 #include <filesystem>
 #include <unordered_map>
diff --git a/zenserver/diag/diagsvcs.h b/zenserver/diag/diagsvcs.h
index 6d2b3a19d..82b7bdf15 100644
--- a/zenserver/diag/diagsvcs.h
+++ b/zenserver/diag/diagsvcs.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <zenhttp/httpserver.h>
 #include <zencore/iobuffer.h>
+#include <zenhttp/httpserver.h>
 
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp
index 796a15d01..5782ce582 100644
--- a/zenserver/diag/logging.cpp
+++ b/zenserver/diag/logging.cpp
@@ -195,13 +195,13 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 
 	std::filesystem::path LogPath = GlobalOptions.DataDir / "logs/zenserver.log";
 
-	bool IsAsync = true;
+	bool					  IsAsync  = true;
 	spdlog::level::level_enum LogLevel = spdlog::level::info;
 
 	if (GlobalOptions.IsDebug)
 	{
 		LogLevel = spdlog::level::debug;
-		IsAsync = false;
+		IsAsync	 = false;
 	}
 
 	if (IsAsync)
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index 006796b28..d49fb616e 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -1004,9 +1004,9 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
 			ResponsePtr += sizeof(ResponseHdr);
 			for (uint32_t ChunkIndex = 0; ChunkIndex < RequestHdr.ChunkCount; ++ChunkIndex)
 			{
-				//const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex];
-				const IoBuffer&			 FoundChunk(OutBlobs[ChunkIndex + 1]);
-				ResponseChunkEntry		 ResponseChunk;
+				// const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex];
+				const IoBuffer&	   FoundChunk(OutBlobs[ChunkIndex + 1]);
+				ResponseChunkEntry ResponseChunk;
 				ResponseChunk.CorrelationId = ChunkIndex;
 				if (FoundChunk)
 				{
diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h
index 3a8e5f8f8..8fe189ab9 100644
--- a/zenserver/projectstore.h
+++ b/zenserver/projectstore.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <zenhttp/httpserver.h>
 #include <zencore/uid.h>
 #include <zencore/xxhash.h>
+#include <zenhttp/httpserver.h>
 #include <zenstore/cas.h>
 #include <zenstore/caslog.h>
 
diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 2dd51fe6c..ba6300c65 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -81,7 +81,7 @@ CloudCacheSession::GetDerivedData(std::string_view BucketId, std::string_view Ke
 
 	cpr::Response Response = Session.Get();
 	m_Log.debug("GET {}", Response);
-	
+
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h
index 7595fe786..9f36704fa 100644
--- a/zenserver/upstream/jupiter.h
+++ b/zenserver/upstream/jupiter.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <zenhttp/httpserver.h>
 #include <zencore/refcount.h>
 #include <zencore/thread.h>
+#include <zenhttp/httpserver.h>
 
 #include <spdlog/spdlog.h>
 
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index e52f6aa60..2dbc4fefd 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -2,7 +2,6 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
-#include <zenhttp/httpserver.h>
 #include <zencore/iobuffer.h>
 #include <zencore/refcount.h>
 #include <zencore/scopeguard.h>
@@ -10,6 +9,7 @@
 #include <zencore/thread.h>
 #include <zencore/timer.h>
 #include <zencore/windows.h>
+#include <zenhttp/httpserver.h>
 #include <zenserverprocess.h>
 #include <zenstore/cas.h>
 #include <zenstore/cidstore.h>
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index d0dd0106b..093f18f6a 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -560,7 +560,7 @@ ZenServerInstance::WaitUntilReady(int Timeout)
 	return m_ReadyEvent.Wait(Timeout);
 }
 
-std::string 
+std::string
 ZenServerInstance::GetBaseUri() const
 {
 	ZEN_ASSERT(m_BasePort);