diff --git a/src/misc.cpp b/src/misc.cpp index 065dad99fa..ee82be1c70 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -74,7 +74,7 @@ void InitializeOldNames(); std::string GenerateUid(std::string_view subject) { extern void NetworkRandomBytesWithFallback(void *buf, size_t n); - extern std::string BytesToHexString(const byte *data, uint length); + extern std::string BytesToHexString(const byte *data, size_t length); uint8 random_bytes[32]; NetworkRandomBytesWithFallback(random_bytes, lengthof(random_bytes)); diff --git a/src/network/network.cpp b/src/network/network.cpp index bd5f92f704..24d851855e 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -1299,7 +1299,7 @@ static void NetworkGenerateServerId() _settings_client.network.network_id = GenerateUid("OpenTTD Server ID"); } -std::string BytesToHexString(const byte *data, uint length) +std::string BytesToHexString(const byte *data, size_t length) { std::string hex_output; hex_output.resize(length * 2); diff --git a/src/network/network_internal.h b/src/network/network_internal.h index f41a97f529..59d03baf74 100644 --- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -162,7 +162,7 @@ StringID GetNetworkErrorMsg(NetworkErrorCode err); bool NetworkMakeClientNameUnique(std::string &new_name); std::string GenerateCompanyPasswordHash(const std::string &password, const std::string &password_server_id, uint32 password_game_seed); std::vector GenerateGeneralPasswordHash(const std::string &password, const std::string &password_server_id, uint64 password_game_seed); -std::string BytesToHexString(const byte *data, uint length); +std::string BytesToHexString(const byte *data, size_t length); std::string NetworkGenerateRandomKeyString(uint bytes); std::string_view ParseCompanyFromConnectionString(const std::string &connection_string, CompanyID *company_id);