aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-10-23 19:00:54 +0200
committerStefan Boberg <[email protected]>2021-10-23 19:00:54 +0200
commit62534b176b04cd7d6b12ac993726e2986b719dbb (patch)
tree63db6f5ebd235ce84f94d2d54912d03fd32af10e
parentcas: fixed some warnings (diff)
downloadzen-62534b176b04cd7d6b12ac993726e2986b719dbb.tar.xz
zen-62534b176b04cd7d6b12ac993726e2986b719dbb.zip
clang-format
-rw-r--r--zencore/include/zencore/refcount.h5
-rw-r--r--zencore/iobuffer.cpp2
-rw-r--r--zenserver-test/zenserver-test.cpp8
-rw-r--r--zenserver/cache/structuredcache.cpp4
-rw-r--r--zenserver/zenserver.cpp7
-rw-r--r--zenstore/caslog.cpp2
-rw-r--r--zenstore/zenstore.cpp2
-rw-r--r--zenutil/include/zenutil/zenserverprocess.h2
8 files changed, 15 insertions, 17 deletions
diff --git a/zencore/include/zencore/refcount.h b/zencore/include/zencore/refcount.h
index 7167ab3b5..1873ce48e 100644
--- a/zencore/include/zencore/refcount.h
+++ b/zencore/include/zencore/refcount.h
@@ -117,8 +117,9 @@ public:
inline ~Ref() { m_Ref && m_Ref->Release(); }
template<typename DerivedType>
- requires std::derived_from<DerivedType, T>
- inline Ref(const Ref<DerivedType>& Rhs) : Ref(Rhs.m_Ref) {}
+ requires std::derived_from<DerivedType, T> inline Ref(const Ref<DerivedType>& Rhs) : Ref(Rhs.m_Ref)
+ {
+ }
[[nodiscard]] inline bool IsNull() const { return m_Ref == nullptr; }
inline explicit operator bool() const { return m_Ref != nullptr; }
diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp
index 7077942bf..6cee3f60d 100644
--- a/zencore/iobuffer.cpp
+++ b/zencore/iobuffer.cpp
@@ -500,7 +500,7 @@ IoBufferBuilder::MakeFromTemporaryFile(const std::filesystem::path& FileName)
Handle = DataFile.Detach();
#else
- int Fd = open(FileName.native().c_str(), O_RDONLY);
+ int Fd = open(FileName.native().c_str(), O_RDONLY);
if (Fd < 0)
{
return {};
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 41dfe8563..1b731ed26 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1882,7 +1882,7 @@ TEST_CASE("zcache.policy")
}
}
-#if ZEN_USE_EXEC
+# if ZEN_USE_EXEC
struct RemoteExecutionRequest
{
@@ -2055,7 +2055,7 @@ TEST_CASE("exec.basic")
TEST_CASE("mesh.basic")
{
// --mesh option only available with ZEN_ENABLE_MESH
-# if ZEN_ENABLE_MESH
+# if ZEN_ENABLE_MESH
using namespace std::literals;
const int kInstanceCount = 4;
@@ -2080,10 +2080,10 @@ TEST_CASE("mesh.basic")
Instance->WaitUntilReady();
}
-# endif
+# endif
}
-#endif
+# endif
class ZenServerTestHelper
{
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index bcb0b1f82..ffb6f563a 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -713,8 +713,8 @@ HttpStructuredCacheService::HandleGetCachePayload(zen::HttpServerRequest& Reques
{
if (CompressedBuffer Compressed = CompressedBuffer::FromCompressed(SharedBuffer(UpstreamResult.Value)))
{
- CidStore::InsertResult Result = m_CidStore.AddChunk(Compressed);
- InUpstreamCache = true;
+ CidStore::InsertResult Result = m_CidStore.AddChunk(Compressed);
+ InUpstreamCache = true;
}
else
{
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index f2442907b..542ad6dd2 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -680,11 +680,8 @@ ZenServer::InitializeStructuredCache(ZenServiceConfig& ServiceConfig)
}
}
- m_StructuredCacheService.reset(new zen::HttpStructuredCacheService(*m_CacheStore,
- *m_CidStore,
- m_StatsService,
- m_StatusService,
- std::move(UpstreamCache)));
+ m_StructuredCacheService.reset(
+ new zen::HttpStructuredCacheService(*m_CacheStore, *m_CidStore, m_StatsService, m_StatusService, std::move(UpstreamCache)));
}
} // namespace zen
diff --git a/zenstore/caslog.cpp b/zenstore/caslog.cpp
index af03e0391..7e323d6c5 100644
--- a/zenstore/caslog.cpp
+++ b/zenstore/caslog.cpp
@@ -87,7 +87,7 @@ CasLogFile::Open(std::filesystem::path FileName, size_t RecordSize, bool IsCreat
AppendOffset -= AppendOffset % RecordSize;
AppendOffset += sizeof Header;
- m_Header = Header;
+ m_Header = Header;
}
m_AppendOffset = AppendOffset;
diff --git a/zenstore/zenstore.cpp b/zenstore/zenstore.cpp
index de0f43cb3..9fdf2dccf 100644
--- a/zenstore/zenstore.cpp
+++ b/zenstore/zenstore.cpp
@@ -4,8 +4,8 @@
#include <zenstore/CAS.h>
#include <zenstore/basicfile.h>
-#include "filecas.h"
#include "compactcas.h"
+#include "filecas.h"
namespace zen {
diff --git a/zenutil/include/zenutil/zenserverprocess.h b/zenutil/include/zenutil/zenserverprocess.h
index bd3f5eb55..bc4b135f0 100644
--- a/zenutil/include/zenutil/zenserverprocess.h
+++ b/zenutil/include/zenutil/zenserverprocess.h
@@ -105,7 +105,7 @@ public:
enum class FlagsEnum : uint16_t
{
kShutdownPlease = 1 << 0,
- kIsReady = 1 << 1,
+ kIsReady = 1 << 1,
};
FRIEND_ENUM_CLASS_FLAGS(FlagsEnum);