mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: Fix clang-tidy mess-ups.

pull/13833/head
frosch 2025-03-16 14:15:59 +01:00
parent 4635d0968f
commit 7ab9e21143
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/core/address.cpp
View File

@ -172,8 +172,8 @@ bool NetworkAddress::IsInNetmask(const std::string &netmask)
uint32_t *mask; uint32_t *mask;
switch (this->address.ss_family) { switch (this->address.ss_family) {
case AF_INET: case AF_INET:
ip = static_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&this->address))->sin_addr.s_addr); ip = reinterpret_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&this->address))->sin_addr.s_addr);
mask = static_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&mask_address.address))->sin_addr.s_addr); mask = reinterpret_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&mask_address.address))->sin_addr.s_addr);
break; break;
case AF_INET6: case AF_INET6:

6
src/network/network_command.cpp
View File

@ -139,8 +139,8 @@ constexpr UnpackNetworkCommandProc MakeUnpackNetworkCommandCallback() noexcept
using Tcallback = std::tuple_element_t<Tcb, decltype(_callback_tuple)>; using Tcallback = std::tuple_element_t<Tcb, decltype(_callback_tuple)>;
if constexpr (std::is_same_v<Tcallback, CommandCallback * const> || // Callback type is CommandCallback. if constexpr (std::is_same_v<Tcallback, CommandCallback * const> || // Callback type is CommandCallback.
std::is_same_v<Tcallback, CommandCallbackData * const> || // Callback type is CommandCallbackData. std::is_same_v<Tcallback, CommandCallbackData * const> || // Callback type is CommandCallbackData.
std::is_same_v<typename CommandTraits<static_cast<>(Tcmd)>::CbArgs, typename CallbackArgsHelper<Tcallback>::Args> || // Callback proc takes all command return values and parameters. std::is_same_v<typename CommandTraits<Tcmd>::CbArgs, typename CallbackArgsHelper<Tcallback>::Args> || // Callback proc takes all command return values and parameters.
(!std::is_void_v<typename CommandTraits<static_cast<>(Tcmd)>::RetTypes> && std::is_same_v<typename CallbackArgsHelper<typename CommandTraits<static_cast<>(Tcmd)>::RetCallbackProc const>::Args, typename CallbackArgsHelper<Tcallback>::Args>)) { // Callback return is more than CommandCost and the proc takes all return values. (!std::is_void_v<typename CommandTraits<Tcmd>::RetTypes> && std::is_same_v<typename CallbackArgsHelper<typename CommandTraits<Tcmd>::RetCallbackProc const>::Args, typename CallbackArgsHelper<Tcallback>::Args>)) { // Callback return is more than CommandCost and the proc takes all return values.
return &UnpackNetworkCommand<Tcmd, Tcb>; return &UnpackNetworkCommand<Tcmd, Tcb>;
} else { } else {
return nullptr; return nullptr;
@ -462,7 +462,7 @@ template <Commands Tcmd>
CommandDataBuffer SanitizeCmdStrings(const CommandDataBuffer &data) CommandDataBuffer SanitizeCmdStrings(const CommandDataBuffer &data)
{ {
auto args = EndianBufferReader::ToValue<typename CommandTraits<Tcmd>::Args>(data); auto args = EndianBufferReader::ToValue<typename CommandTraits<Tcmd>::Args>(data);
SanitizeStringsHelper(CommandTraits<Tcmd>::flags, args, std::make_index_sequence<std::tuple_size_v<typename CommandTraits<static_cast<>(Tcmd)>::Args>>{}); SanitizeStringsHelper(CommandTraits<Tcmd>::flags, args, std::make_index_sequence<std::tuple_size_v<typename CommandTraits<Tcmd>::Args>>{});
return EndianBufferWriter<CommandDataBuffer>::FromValue(args); return EndianBufferWriter<CommandDataBuffer>::FromValue(args);
} }

2
src/strgen/strgen.cpp
View File

@ -133,7 +133,7 @@ void FileStringReader::HandlePragma(char *str)
} else if (!memcmp(str, "winlangid ", 10)) { } else if (!memcmp(str, "winlangid ", 10)) {
const char *buf = str + 10; const char *buf = str + 10;
long langid = std::strtol(buf, nullptr, 16); long langid = std::strtol(buf, nullptr, 16);
if (langid > static_cast<long>UINT16_MAX || langid < 0) { if (langid > static_cast<long>(UINT16_MAX) || langid < 0) {
FatalError("Invalid winlangid {}", buf); FatalError("Invalid winlangid {}", buf);
} }
_lang.winlangid = static_cast<uint16_t>(langid); _lang.winlangid = static_cast<uint16_t>(langid);