diff options
author | 2022-10-06 12:31:33 -0700 | |
---|---|---|
committer | 2022-10-06 12:32:48 -0700 | |
commit | 8317b9a01cbc32594ad4bf971709c97cb13ec921 (patch) | |
tree | b5b22d90392021f249d9b2659db2df0bfa82e03a /absl/log/internal/log_format.cc | |
parent | 10e7b4b72d58bc1476a1dcc94a779b4804974256 (diff) |
Fix "unsafe narrowing" warnings in absl, 11/n.
Addresses failures with the following, in some files:
-Wshorten-64-to-32
-Wimplicit-int-conversion
-Wsign-compare
-Wsign-conversion
-Wtautological-unsigned-zero-compare
(This specific CL focuses on the logging facility.)
Bug: chromium:1292951
PiperOrigin-RevId: 479384741
Change-Id: Id450438ea3781ce25137366ca16757e810020ad4
Diffstat (limited to 'absl/log/internal/log_format.cc')
-rw-r--r-- | absl/log/internal/log_format.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/absl/log/internal/log_format.cc b/absl/log/internal/log_format.cc index b10a656b..5d40d253 100644 --- a/absl/log/internal/log_format.cc +++ b/absl/log/internal/log_format.cc @@ -78,7 +78,7 @@ size_t FormatBoundedFields(absl::LogSeverity severity, absl::Time timestamp, absl::LogSeverityName(severity)[0], static_cast<int>(tv.tv_sec), static_cast<int>(tv.tv_usec), static_cast<int>(tid)); if (snprintf_result >= 0) { - buf.remove_prefix(snprintf_result); + buf.remove_prefix(static_cast<size_t>(snprintf_result)); return static_cast<size_t>(snprintf_result); } return 0; @@ -87,26 +87,27 @@ size_t FormatBoundedFields(absl::LogSeverity severity, absl::Time timestamp, char* p = buf.data(); *p++ = absl::LogSeverityName(severity)[0]; const absl::TimeZone::CivilInfo ci = tz->At(timestamp); - absl::numbers_internal::PutTwoDigits(ci.cs.month(), p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(ci.cs.month()), p); p += 2; - absl::numbers_internal::PutTwoDigits(ci.cs.day(), p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(ci.cs.day()), p); p += 2; *p++ = ' '; - absl::numbers_internal::PutTwoDigits(ci.cs.hour(), p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(ci.cs.hour()), p); p += 2; *p++ = ':'; - absl::numbers_internal::PutTwoDigits(ci.cs.minute(), p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(ci.cs.minute()), p); p += 2; *p++ = ':'; - absl::numbers_internal::PutTwoDigits(ci.cs.second(), p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(ci.cs.second()), p); p += 2; *p++ = '.'; const int64_t usecs = absl::ToInt64Microseconds(ci.subsecond); - absl::numbers_internal::PutTwoDigits(usecs / 10000, p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(usecs / 10000), p); p += 2; - absl::numbers_internal::PutTwoDigits(usecs / 100 % 100, p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(usecs / 100 % 100), + p); p += 2; - absl::numbers_internal::PutTwoDigits(usecs % 100, p); + absl::numbers_internal::PutTwoDigits(static_cast<size_t>(usecs % 100), p); p += 2; *p++ = ' '; constexpr bool unsigned_tid_t = !std::is_signed<log_internal::Tid>::value; @@ -118,7 +119,7 @@ size_t FormatBoundedFields(absl::LogSeverity severity, absl::Time timestamp, if ((unsigned_tid_t || tid > -100000) && tid < 1000000) *p++ = ' '; p = absl::numbers_internal::FastIntToBuffer(tid, p); *p++ = ' '; - const size_t bytes_formatted = p - buf.data(); + const size_t bytes_formatted = static_cast<size_t>(p - buf.data()); buf.remove_prefix(bytes_formatted); return bytes_formatted; } @@ -146,7 +147,7 @@ size_t FormatLineNumber(int line, absl::Span<char>& buf) { p = absl::numbers_internal::FastIntToBuffer(line, p); *p++ = ']'; *p++ = ' '; - const size_t bytes_formatted = p - buf.data(); + const size_t bytes_formatted = static_cast<size_t>(p - buf.data()); buf.remove_prefix(bytes_formatted); return bytes_formatted; } |