dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change FormatArrayAsHex to be uppercase by default

Browse Source 
To match upstream
This commit is contained in:
Jonathan G Rennison
2024-05-20 18:30:57 +01:00
parent 48910a8b7d
commit 88d7be1d99
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/command.cpp
View File

@@ -1180,7 +1180,7 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32_t p1, uint32_t p2, uint64_
std::vector<uint8_t> buffer; std::vector<uint8_t> buffer;
CommandSerialisationBuffer serialiser(buffer, SHRT_MAX); CommandSerialisationBuffer serialiser(buffer, SHRT_MAX);
aux_data->Serialise(serialiser); aux_data->Serialise(serialiser);
aux_str = FormatArrayAsHex(buffer); aux_str = FormatArrayAsHex(buffer, false);
} }
std::string text_buf; std::string text_buf;
if (text != nullptr) { if (text != nullptr) {

4
src/network/network.cpp
View File

@@ -219,7 +219,7 @@ std::string GenerateCompanyPasswordHash(const std::string &password, const std::
checksum.Append(salted_password_string.data(), salted_password_string.size()); checksum.Append(salted_password_string.data(), salted_password_string.size());
checksum.Finish(digest); checksum.Finish(digest);
return FormatArrayAsHex(digest); return FormatArrayAsHex(digest, false);
} }
/** /**
@@ -1375,7 +1375,7 @@ std::string NetworkGenerateRandomKeyString(uint bytes)
uint8_t *key = AllocaM(uint8_t, bytes); uint8_t *key = AllocaM(uint8_t, bytes);
RandomBytesWithFallback({ key, bytes }); RandomBytesWithFallback({ key, bytes });
return FormatArrayAsHex({key, bytes}); return FormatArrayAsHex({key, bytes}, false);
} }
/** This tries to launch the network for a given OS */ /** This tries to launch the network for a given OS */

2
src/string_func.h
View File

@@ -41,7 +41,7 @@ int CDECL vseprintf(char *str, const char *last, const char *format, va_list ap)
std::string CDECL stdstr_fmt(const char *str, ...) WARN_FORMAT(1, 2); std::string CDECL stdstr_fmt(const char *str, ...) WARN_FORMAT(1, 2);
std::string stdstr_vfmt(const char *str, va_list va) WARN_FORMAT(1, 0); std::string stdstr_vfmt(const char *str, va_list va) WARN_FORMAT(1, 0);
std::string FormatArrayAsHex(std::span<const uint8_t> data, bool upper_case = false); std::string FormatArrayAsHex(std::span<const uint8_t> data, bool upper_case = true);
char *StrMakeValidInPlace(char *str, const char *last, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK) NOACCESS(2); char *StrMakeValidInPlace(char *str, const char *last, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK) NOACCESS(2);
[[nodiscard]] std::string StrMakeValid(std::string_view str, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK); [[nodiscard]] std::string StrMakeValid(std::string_view str, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK);

4
src/tests/string_func.cpp
View File

@@ -341,7 +341,9 @@ TEST_CASE("FormatArrayAsHex")
{ {
CHECK(FormatArrayAsHex(std::array<uint8_t, 0>{}) == ""); CHECK(FormatArrayAsHex(std::array<uint8_t, 0>{}) == "");
CHECK(FormatArrayAsHex(std::array<uint8_t, 1>{0x12}) == "12"); CHECK(FormatArrayAsHex(std::array<uint8_t, 1>{0x12}) == "12");
CHECK(FormatArrayAsHex(std::array<uint8_t, 4>{0x13, 0x38, 0x42, 0xAF}) == "133842af"); CHECK(FormatArrayAsHex(std::array<uint8_t, 4>{0x13, 0x38, 0x42, 0xAF}) == "133842AF");
CHECK(FormatArrayAsHex(std::array<uint8_t, 4>{0x13, 0x38, 0x42, 0xAF}, true) == "133842AF");
CHECK(FormatArrayAsHex(std::array<uint8_t, 4>{0x13, 0x38, 0x42, 0xAF}, false) == "133842af");
} }
TEST_CASE("ConvertHexToBytes") TEST_CASE("ConvertHexToBytes")