aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver/storage/storageconfig.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2025-11-01 14:04:35 +0100
committerGitHub Enterprise <[email protected]>2025-11-01 14:04:35 +0100
commita58da97f98697580bf128ed5723ba720cc30f0dc (patch)
tree798e392ddf76128a506293dc0803aaf852203dcd /src/zenserver/storage/storageconfig.cpp
parentfix use-after-free in TEST_CASE("compactcas.threadedinsert") (#620) (diff)
downloadzen-a58da97f98697580bf128ed5723ba720cc30f0dc.tar.xz
zen-a58da97f98697580bf128ed5723ba720cc30f0dc.zip
Various fixes to address issues flagged by gcc / non-UE toolchain build (#621)
* gcc: avoid using memset on nontrivial struct * redundant `return std::move` * fixed various compilation issues flagged by gcc * fix issue in xmake.lua detecting whether we are building with the UE toolchain or not * add GCC ignore -Wundef (comment is inaccurate) * remove redundant std::move * don't catch exceptions by value * unreferenced variables * initialize "by the book" instead of memset * remove unused exception reference * add #include <cstring> to fix gcc build * explicitly poulate KeyValueMap by traversing input spans fixes gcc compilation * remove unreferenced variable * eliminate redundant `std::move` which gcc complains about * fix gcc compilation by including <cstring> * tag unreferenced variable to fix gcc compilation * fixes for various cases of naming members the same as their type
Diffstat (limited to 'src/zenserver/storage/storageconfig.cpp')
-rw-r--r--src/zenserver/storage/storageconfig.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zenserver/storage/storageconfig.cpp b/src/zenserver/storage/storageconfig.cpp
index 61844140e..3a41ad003 100644
--- a/src/zenserver/storage/storageconfig.cpp
+++ b/src/zenserver/storage/storageconfig.cpp
@@ -41,7 +41,7 @@ ZenStorageServerConfigurator::ValidateOptions()
throw OptionParseException(fmt::format("'--encryption-aes-iv' ('{}') is malformed", ServerOptions.EncryptionIV), {});
}
}
- if (ServerOptions.HttpServerConfig.ForceLoopback && ServerOptions.IsDedicated)
+ if (ServerOptions.HttpConfig.ForceLoopback && ServerOptions.IsDedicated)
{
throw OptionParseException("'--dedicated' conflicts with '--http-forceloopback'", {});
}
@@ -602,7 +602,7 @@ ZenStorageServerConfigurator::ParsePluginsConfigFile(const std::filesystem::path
Config.PluginOptions.push_back({"port", std::to_string(m_ServerOptions.BasePort)});
}
- m_ServerOptions.HttpServerConfig.PluginConfigs.push_back(Config);
+ m_ServerOptions.HttpConfig.PluginConfigs.push_back(Config);
}
}