aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-10-15 11:25:16 +0200
committerStefan Boberg <[email protected]>2021-10-15 11:25:35 +0200
commit01de07426c9d923c8c0b4ef7272b5b822399c4a7 (patch)
treea6ea0eda7316864ab63721bd10f642ad5ad57da8
parenthttpasio: implemented proper handling of query strings (diff)
downloadzen-01de07426c9d923c8c0b4ef7272b5b822399c4a7.tar.xz
zen-01de07426c9d923c8c0b4ef7272b5b822399c4a7.zip
clang-format
-rw-r--r--zencore/include/zencore/stats.h2
-rw-r--r--zenhttp/httpsys.cpp3
-rw-r--r--zenserver/cache/structuredcachestore.cpp2
-rw-r--r--zenserver/zenserver.cpp6
-rw-r--r--zenstore/basicfile.cpp2
-rw-r--r--zenstore/filecas.cpp8
6 files changed, 13 insertions, 10 deletions
diff --git a/zencore/include/zencore/stats.h b/zencore/include/zencore/stats.h
index 884bb53f6..d58435a20 100644
--- a/zencore/include/zencore/stats.h
+++ b/zencore/include/zencore/stats.h
@@ -223,7 +223,7 @@ private:
/** Metrics for network requests
- Aggregates tracking of duration, payload sizes into a single
+ Aggregates tracking of duration, payload sizes into a single
class
*/
diff --git a/zenhttp/httpsys.cpp b/zenhttp/httpsys.cpp
index 0a9341d0c..f3568bbd1 100644
--- a/zenhttp/httpsys.cpp
+++ b/zenhttp/httpsys.cpp
@@ -1267,8 +1267,7 @@ HttpSysServerRequest::HttpSysServerRequest(HttpSysTransaction& Tx, HttpService&
m_QueryStringUtf8.Reset();
}
- m_QueryString = std::string_view(m_QueryStringUtf8);
-
+ m_QueryString = std::string_view(m_QueryStringUtf8);
m_Verb = TranslateHttpVerb(HttpRequestPtr->Verb);
m_ContentLength = GetContentLength(HttpRequestPtr);
m_ContentType = GetContentType(HttpRequestPtr);
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index ccd06b540..9f63699e5 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -728,7 +728,7 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
if (Ec)
{
std::error_code InnerEc;
- const uint64_t ExistingFileSize = std::filesystem::file_size(FsPath, InnerEc);
+ const uint64_t ExistingFileSize = std::filesystem::file_size(FsPath, InnerEc);
if (!InnerEc && ExistingFileSize == Value.Value.Size())
{
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 1fddec437..a1cd01d33 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -108,7 +108,11 @@ using namespace std::literals;
class ZenServer : public IHttpStatusProvider
{
public:
- void Initialize(ZenServiceConfig& ServiceConfig, std::string_view HttpServerClass, int BasePort, int ParentPid, ZenServerState::ZenServerEntry* ServerEntry)
+ void Initialize(ZenServiceConfig& ServiceConfig,
+ std::string_view HttpServerClass,
+ int BasePort,
+ int ParentPid,
+ ZenServerState::ZenServerEntry* ServerEntry)
{
using namespace fmt::literals;
diff --git a/zenstore/basicfile.cpp b/zenstore/basicfile.cpp
index cfc77e2a5..bbb9e1036 100644
--- a/zenstore/basicfile.cpp
+++ b/zenstore/basicfile.cpp
@@ -143,7 +143,7 @@ BasicFile::StreamByteRange(uint64_t FileOffset, uint64_t Size, std::function<voi
}
}
-void
+void
BasicFile::Write(MemoryView Data, uint64_t FileOffset, std::error_code& Ec)
{
Write(Data.GetData(), Data.GetSize(), FileOffset, Ec);
diff --git a/zenstore/filecas.cpp b/zenstore/filecas.cpp
index f69ed6bdb..f928f5c21 100644
--- a/zenstore/filecas.cpp
+++ b/zenstore/filecas.cpp
@@ -137,10 +137,10 @@ FileCasStrategy::InsertChunk(IoBuffer Chunk, const IoHash& ChunkHash)
}
else if (hRes == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION))
{
- // Sharing violation, likely because we are trying to open a file
- // which has been renamed on another thread, and the file handle
- // used to rename it is still open. We handle this case below
- // instead of here
+ // Sharing violation, likely because we are trying to open a file
+ // which has been renamed on another thread, and the file handle
+ // used to rename it is still open. We handle this case below
+ // instead of here
}
else
{