diff options
| author | Stefan Boberg <[email protected]> | 2021-09-06 19:06:23 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-06 19:06:23 +0200 |
| commit | 2d1144d21a1c606434a025724e85c23824f0ca35 (patch) | |
| tree | 570fc126c2084ac4a3b1dee61565f487ae6b3063 | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-2d1144d21a1c606434a025724e85c23824f0ca35.tar.xz zen-2d1144d21a1c606434a025724e85c23824f0ca35.zip | |
clang-format fixes
| -rw-r--r-- | zencore/crc32.cpp | 2 | ||||
| -rw-r--r-- | zencore/include/zencore/memory.h | 2 | ||||
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 8 | ||||
| -rw-r--r-- | zenserver/config.cpp | 2 | ||||
| -rw-r--r-- | zenserver/upstream/upstreamcache.cpp | 6 |
5 files changed, 12 insertions, 8 deletions
diff --git a/zencore/crc32.cpp b/zencore/crc32.cpp index cd381d49f..d4a3cac57 100644 --- a/zencore/crc32.cpp +++ b/zencore/crc32.cpp @@ -418,7 +418,7 @@ static const uint32_t CRCTablesSB8[8][256] = { 0xbd4e1337, 0x71e413a9, 0x7b211ab0, 0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61, 0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678, 0x264b06e6}}; -#define BYTESWAP_ORDER32(x) (((x) >> 24) + (((x) >> 8) & 0xff00) + (((x) << 8) & 0xff0000) + ((x) << 24)) +#define BYTESWAP_ORDER32(x) (((x) >> 24) + (((x) >> 8) & 0xff00) + (((x) << 8) & 0xff0000) + ((x) << 24)) #define UE_PTRDIFF_TO_UINT32(argument) static_cast<uint32_t>(argument) template<typename T> diff --git a/zencore/include/zencore/memory.h b/zencore/include/zencore/memory.h index 040f97025..5a324955d 100644 --- a/zencore/include/zencore/memory.h +++ b/zencore/include/zencore/memory.h @@ -53,7 +53,7 @@ public: inline void Free(void* Ptr) { ZEN_UNUSED(Ptr); /* no-op */ } ChunkingLinearAllocator(const ChunkingLinearAllocator&) = delete; - ChunkingLinearAllocator&operator=(const ChunkingLinearAllocator&) = delete; + ChunkingLinearAllocator& operator=(const ChunkingLinearAllocator&) = delete; private: uint8_t* m_ChunkCursor = nullptr; diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index 008cae27e..455ab2495 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -89,7 +89,7 @@ public: void Get(const std::string_view Server, int Port, const std::string_view Path) { ZEN_UNUSED(Port); - + http_parser_init(&m_HttpParser, HTTP_RESPONSE); m_HttpParser.data = this; @@ -152,7 +152,11 @@ private: return 0; } int OnMessageBegin() { return 0; } - int OnBody(const char* Data, size_t Bytes) { ZEN_UNUSED(Data, Bytes); return 0; } + int OnBody(const char* Data, size_t Bytes) + { + ZEN_UNUSED(Data, Bytes); + return 0; + } void OnConnected() { diff --git a/zenserver/config.cpp b/zenserver/config.cpp index 06b355b7a..c356b9f0b 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -235,7 +235,7 @@ ParseServiceConfig(const std::filesystem::path& DataRoot, ZenServiceConfig& Serv throw std::exception("fatal zen global config script ({}) failure: {}"_format(ConfigScript, e.what()).c_str()); } - ServiceConfig.MeshEnabled = lua["mesh"]["enable"].get_or(ServiceConfig.MeshEnabled); + ServiceConfig.MeshEnabled = lua["mesh"]["enable"].get_or(ServiceConfig.MeshEnabled); auto UpdateStringValueFromConfig = [](const sol::table& Table, std::string_view Key, std::string& OutValue) { // Update the specified config value unless it has been set, i.e. from command line diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index 40d7ebd26..6c9baf9b0 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -100,7 +100,7 @@ namespace detail { virtual bool Initialize() override { - //TODO: Test and authenticate Jupiter client connection + // TODO: Test and authenticate Jupiter client connection return !m_Client->ServiceUrl().empty(); } @@ -216,8 +216,8 @@ namespace detail { ~ZenUpstreamEndpoint() = default; virtual bool Initialize() override - { - //TODO: Test and authenticate Zen client connection + { + // TODO: Test and authenticate Zen client connection return !m_Client->ServiceUrl().empty(); } |