diff options
| author | Martin Ridgers <[email protected]> | 2021-09-09 13:39:59 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-09-14 14:29:28 +0200 |
| commit | 8d346a746d998330f974b022c19b7e7e19834e51 (patch) | |
| tree | ce4f66d647dcaca85fe1a5cda8f929dd917b2fd6 | |
| parent | Use sprintf() where _itoa_s() is not available (diff) | |
| download | zen-8d346a746d998330f974b022c19b7e7e19834e51.tar.xz zen-8d346a746d998330f974b022c19b7e7e19834e51.zip | |
Replaced use of "%ll?" format specifiers with PRI?64
| -rw-r--r-- | zencore/stream.cpp | 4 | ||||
| -rw-r--r-- | zencore/string.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/zencore/stream.cpp b/zencore/stream.cpp index 54bcb1f5d..34fff19bb 100644 --- a/zencore/stream.cpp +++ b/zencore/stream.cpp @@ -137,7 +137,7 @@ operator<<(TextWriter& writer, int64_t value) #if ZEN_PLATFORM_WINDOWS _i64toa_s(value, buffer, sizeof buffer, 10); #else - sprintf(buffer, PRId64, value); + sprintf(buffer, "%" PRId64, value); #endif writer << buffer; return writer; @@ -189,7 +189,7 @@ operator<<(TextWriter& writer, uint64_t value) #if ZEN_PLATFORM_WINDOWS _ui64toa_s(value, buffer, sizeof buffer, 10); #else - sprintf(buffer, PRIu64, value); + sprintf(buffer, "%" PRIu64, value); #endif writer << buffer; return writer; diff --git a/zencore/string.cpp b/zencore/string.cpp index 3037df0e7..764b3de03 100644 --- a/zencore/string.cpp +++ b/zencore/string.cpp @@ -34,14 +34,14 @@ namespace zen { bool ToString(std::span<char> Buffer, uint64_t Num) { - snprintf(Buffer.data(), Buffer.size(), "%I64u", Num); + snprintf(Buffer.data(), Buffer.size(), "%" PRIu64, Num); return true; } bool ToString(std::span<char> Buffer, int64_t Num) { - snprintf(Buffer.data(), Buffer.size(), "%I64d", Num); + snprintf(Buffer.data(), Buffer.size(), "%" PRId64, Num); return true; } @@ -231,12 +231,12 @@ NiceNumGeneral(uint64_t Num, std::span<char> Buffer, NicenumFormat Format) switch (Format) { case kNicenumRaw: - return snprintf(Buffer.data(), Buffer.size(), "%llu", (uint64_t)Num); + return snprintf(Buffer.data(), Buffer.size(), "%" PRIu64, (uint64_t)Num); case kNicenumRawTime: if (Num > 0) { - return snprintf(Buffer.data(), Buffer.size(), "%llu", (uint64_t)Num); + return snprintf(Buffer.data(), Buffer.size(), "%" PRIu64, (uint64_t)Num); } else { @@ -275,7 +275,7 @@ NiceNumGeneral(uint64_t Num, std::span<char> Buffer, NicenumFormat Format) * If this is an even multiple of the base, always display * without any decimal precision. */ - return snprintf(Buffer.data(), Buffer.size(), "%llu%s", (uint64_t)n, u); + return snprintf(Buffer.data(), Buffer.size(), "%" PRIu64 "%s", (uint64_t)n, u); } else { |