aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-05-27 19:18:26 +0200
committerStefan Boberg <[email protected]>2021-05-27 19:18:26 +0200
commit9863888606d408c41e9ff89f194102604f40cceb (patch)
tree887abb29dc43385a20a6c7dbe6312734aa2c99ee
parentAdded some more diagnostics to potential file operation errors (diff)
downloadzen-9863888606d408c41e9ff89f194102604f40cceb.tar.xz
zen-9863888606d408c41e9ff89f194102604f40cceb.zip
clang-format fixes
-rw-r--r--zencore/crc32.cpp1
-rw-r--r--zenserver/cache/structuredcache.cpp6
-rw-r--r--zenserver/projectstore.cpp16
3 files changed, 12 insertions, 11 deletions
diff --git a/zencore/crc32.cpp b/zencore/crc32.cpp
index a6c3fcc47..bb4dc1f42 100644
--- a/zencore/crc32.cpp
+++ b/zencore/crc32.cpp
@@ -1,6 +1,5 @@
// Copyright Epic Games, Inc. All Rights Reserved.
-
#include "zencore/crc32.h"
namespace CRC32 {
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index b244c881c..fc93896fc 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -261,7 +261,9 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
if (!Compressed)
{
// All attachment payloads need to be in compressed buffer format
- return Request.WriteResponse(zen::HttpResponse::BadRequest, HttpContentType::kText, "Attachments must be compressed");
+ return Request.WriteResponse(zen::HttpResponse::BadRequest,
+ HttpContentType::kText,
+ "Attachments must be compressed");
}
else
{
@@ -282,7 +284,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
else
{
return Request.WriteResponse(zen::HttpResponse::OK);
- }
+ }
}
}
}
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index 6cf5dc161..eccaacff5 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -220,14 +220,14 @@ struct ProjectStore::OplogStorage : public RefCounted
spdlog::logger& Log() { return m_OwnerOplog->Log(); }
private:
- ProjectStore::Oplog* m_OwnerOplog;
- std::filesystem::path m_OplogStoragePath;
- RwLock m_RwLock;
- TCasLogFile<OplogEntry> m_Oplog;
- BasicFile m_OpBlobs;
- std::atomic<uint64_t> m_NextOpsOffset{0};
- uint64_t m_OpsAlign = 32;
- std::atomic<uint32_t> m_MaxLsn{0};
+ ProjectStore::Oplog* m_OwnerOplog;
+ std::filesystem::path m_OplogStoragePath;
+ RwLock m_RwLock;
+ TCasLogFile<OplogEntry> m_Oplog;
+ BasicFile m_OpBlobs;
+ std::atomic<uint64_t> m_NextOpsOffset{0};
+ uint64_t m_OpsAlign = 32;
+ std::atomic<uint32_t> m_MaxLsn{0};
#if USE_ROCKSDB
std::unique_ptr<rocksdb::DB> m_RocksDb;