diff options
| author | Per Larsson <[email protected]> | 2021-12-09 17:02:21 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-12-09 17:02:21 +0100 |
| commit | 7232c5b126028ef859977d7a2a65fe9ca7b7300f (patch) | |
| tree | bfaa76f874ae65279b76f82a9eeb39075321b672 /zenserver | |
| parent | Merged main. (diff) | |
| download | zen-7232c5b126028ef859977d7a2a65fe9ca7b7300f.tar.xz zen-7232c5b126028ef859977d7a2a65fe9ca7b7300f.zip | |
Format fix.
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/cache/cachetracking.h | 4 | ||||
| -rw-r--r-- | zenserver/compute/apply.cpp | 5 | ||||
| -rw-r--r-- | zenserver/config.cpp | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/zenserver/cache/cachetracking.h b/zenserver/cache/cachetracking.h index d4bd8da25..06109ebb0 100644 --- a/zenserver/cache/cachetracking.h +++ b/zenserver/cache/cachetracking.h @@ -1,10 +1,12 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + #pragma once #include <zencore/iohash.h> +#include <stdint.h> #include <filesystem> #include <functional> -#include <stdint.h> namespace zen { diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp index ae4dd4528..11ae8b41d 100644 --- a/zenserver/compute/apply.cpp +++ b/zenserver/compute/apply.cpp @@ -904,10 +904,7 @@ HttpFunctionService::ExecActionUpstream(const WorkerDesc& Worker, CbObject Actio if (!EnqueueResult.Success) { - ZEN_ERROR( - "Error enqueuing upstream Action {}/{}", - WorkerId.ToHexString(), - ActionId.ToHexString()); + ZEN_ERROR("Error enqueuing upstream Action {}/{}", WorkerId.ToHexString(), ActionId.ToHexString()); return HttpResponseCode::InternalServerError; } diff --git a/zenserver/config.cpp b/zenserver/config.cpp index 23450c370..3aef3f499 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -45,11 +45,11 @@ PickDefaultStateDirectory() return myDocumentsDir; } - int CandidateDriveLetterOffset = -1; + int CandidateDriveLetterOffset = -1; ULARGE_INTEGER CandidateDriveSize; CandidateDriveSize.QuadPart = 0L; - DWORD LogicalDrives = GetLogicalDrives(); - char CandidateDriveName[] = "A:\\"; + DWORD LogicalDrives = GetLogicalDrives(); + char CandidateDriveName[] = "A:\\"; for (int DriveLetterOffset = 0; DriveLetterOffset < 32; ++DriveLetterOffset) { if ((LogicalDrives & (1 << DriveLetterOffset)) != 0) @@ -64,7 +64,7 @@ PickDefaultStateDirectory() if ((FreeBytesAvailableToCaller.QuadPart > 0) && (TotalNumberOfBytes.QuadPart > CandidateDriveSize.QuadPart)) { CandidateDriveLetterOffset = DriveLetterOffset; - CandidateDriveSize = TotalNumberOfBytes; + CandidateDriveSize = TotalNumberOfBytes; } } } @@ -74,7 +74,7 @@ PickDefaultStateDirectory() if (CandidateDriveLetterOffset >= 0) { char RootZenFolderName[] = "A:\\zen"; - RootZenFolderName[0] = (char)('A' + CandidateDriveLetterOffset); + RootZenFolderName[0] = (char)('A' + CandidateDriveLetterOffset); return RootZenFolderName; } |