diff options
| author | Per Larsson <[email protected]> | 2022-01-22 11:11:34 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-01-22 11:11:34 +0100 |
| commit | aef9c292beae2245da35f60fa8c8bd9c52fd248f (patch) | |
| tree | 798c254a0a3c867b5bc79c676684de7d47de6cc9 /zenserver | |
| parent | Use ExtendablePathBuilders (diff) | |
| download | zen-aef9c292beae2245da35f60fa8c8bd9c52fd248f.tar.xz zen-aef9c292beae2245da35f60fa8c8bd9c52fd248f.zip | |
Format fix.
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 2 | ||||
| -rw-r--r-- | zenserver/compute/apply.cpp | 6 | ||||
| -rw-r--r-- | zenserver/config.cpp | 7 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 3 | ||||
| -rw-r--r-- | zenserver/upstream/upstreamcache.cpp | 28 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 2 |
6 files changed, 26 insertions, 22 deletions
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index 53dd3d5c5..2bba2e8e6 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -857,7 +857,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx) // Remove all standalone file(s) // NOTE: This can probably be made asynchronously { - std::error_code Ec; + std::error_code Ec; ExtendablePathBuilder<256> Path; for (const auto& Entry : ExpiredEntries) diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp index 95902a752..fe2889c7f 100644 --- a/zenserver/compute/apply.cpp +++ b/zenserver/compute/apply.cpp @@ -737,7 +737,8 @@ HttpFunctionService::ExecAction(const WorkerDesc& Worker, CbObject Action) if (DataBuffer.Size() != Size) { - throw std::runtime_error(fmt::format("worker CAS chunk '{}' size: {}, action spec expected {}", ChunkHash, DataBuffer.Size(), Size)); + throw std::runtime_error( + fmt::format("worker CAS chunk '{}' size: {}, action spec expected {}", ChunkHash, DataBuffer.Size(), Size)); } zen::WriteFile(FilePath, DataBuffer); @@ -768,7 +769,8 @@ HttpFunctionService::ExecAction(const WorkerDesc& Worker, CbObject Action) if (DataBuffer.Size() != Size) { - throw std::runtime_error(fmt::format("worker CAS chunk '{}' size: {}, action spec expected {}", ChunkHash, DataBuffer.Size(), Size)); + throw std::runtime_error( + fmt::format("worker CAS chunk '{}' size: {}, action spec expected {}", ChunkHash, DataBuffer.Size(), Size)); } zen::WriteFile(FilePath, DataBuffer); diff --git a/zenserver/config.cpp b/zenserver/config.cpp index 4cb949b0e..da37efbb7 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -32,11 +32,8 @@ std::filesystem::path PickDefaultStateDirectory() { // Pick sensible default - PWSTR programDataDir = nullptr; - HRESULT hRes = SHGetKnownFolderPath(FOLDERID_ProgramData, - 0, - NULL, - &programDataDir); + PWSTR programDataDir = nullptr; + HRESULT hRes = SHGetKnownFolderPath(FOLDERID_ProgramData, 0, NULL, &programDataDir); if (SUCCEEDED(hRes)) { diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 42d785126..fa4f77209 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -152,7 +152,8 @@ struct ProjectStore::OplogStorage : public RefCounted } else { - throw std::runtime_error(fmt::format("column family iteration failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str()); + throw std::runtime_error( + fmt::format("column family iteration failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str()); } Status = rocksdb::DB::Open(Options, RocksdbPath, ColumnDescriptors, &m_RocksDbColumnHandles, &Db); diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index 520833a3c..65624ef17 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -348,9 +348,10 @@ namespace detail { if (!RefResult.Success) { - return {.Reason = fmt::format("upload cache record '{}/{}' FAILED, reason '{}'", CacheRecord.Key.Bucket, - CacheRecord.Key.Hash, - RefResult.Reason), + return {.Reason = fmt::format("upload cache record '{}/{}' FAILED, reason '{}'", + CacheRecord.Key.Bucket, + CacheRecord.Key.Hash, + RefResult.Reason), .Success = false}; } @@ -369,9 +370,10 @@ namespace detail { if (!FinalizeResult.Success) { - return {.Reason = fmt::format("finalize cache record '{}/{}' FAILED, reason '{}'", CacheRecord.Key.Bucket, - CacheRecord.Key.Hash, - FinalizeResult.Reason), + return {.Reason = fmt::format("finalize cache record '{}/{}' FAILED, reason '{}'", + CacheRecord.Key.Bucket, + CacheRecord.Key.Hash, + FinalizeResult.Reason), .Success = false}; } @@ -387,9 +389,10 @@ namespace detail { if (!FinalizeResult.Success) { - return {.Reason = fmt::format("finalize '{}/{}' FAILED, reason '{}'", CacheRecord.Key.Bucket, - CacheRecord.Key.Hash, - FinalizeResult.Reason), + return {.Reason = fmt::format("finalize '{}/{}' FAILED, reason '{}'", + CacheRecord.Key.Bucket, + CacheRecord.Key.Hash, + FinalizeResult.Reason), .Success = false}; } @@ -401,9 +404,10 @@ namespace detail { Sb << MissingHash.ToHexString() << ","; } - return {.Reason = fmt::format("finalize '{}/{}' FAILED, still needs payload(s) '{}'", CacheRecord.Key.Bucket, - CacheRecord.Key.Hash, - Sb.ToString()), + return {.Reason = fmt::format("finalize '{}/{}' FAILED, still needs payload(s) '{}'", + CacheRecord.Key.Bucket, + CacheRecord.Key.Hash, + Sb.ToString()), .Success = false}; } } diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 96b04bdcd..60691222b 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -70,7 +70,7 @@ ZEN_THIRD_PARTY_INCLUDES_END #if !defined(ZEN_USE_SENTRY) # if ZEN_PLATFORM_MAC && ZEN_ARCH_ARM64 - // vcpkg's sentry-native port does not support Arm on Mac. +// vcpkg's sentry-native port does not support Arm on Mac. # define ZEN_USE_SENTRY 0 # else # define ZEN_USE_SENTRY 1 |