commit 9b0008cf85ce08ed3e961174db564ea082cb3c2f
author Lei Zhang <thestig@chromium.org> Tue Mar 01 23:59:28 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 01 23:59:28 2022 +0000
tree 43ce5002d9e1ad87871af995318487f0f1671197
parent d1e4139bb28ee509788604223cc17d41a5af02de

Fix nits in CFX_DateTime::Now().

Fix casts and update variable names to match Chromium style.

Change-Id: I57dedbf68745755fdf4e13fda8984df54785023c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/91099
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxcrt/cfx_datetime.cpp

diff --git a/core/fxcrt/cfx_datetime.cpp b/core/fxcrt/cfx_datetime.cpp
index 4ae8f67..b45d39f 100644
--- a/core/fxcrt/cfx_datetime.cpp
+++ b/core/fxcrt/cfx_datetime.cpp
@@ -69,7 +69,8 @@
          iYear / 400;
 }
 
-struct FXUT_SYSTEMTIME {
+// Exact same structure as Win32 SYSTEMTIME.
+struct FX_SYSTEMTIME {
   uint16_t wYear;
   uint16_t wMonth;
   uint16_t wDayOfWeek;
@@ -98,33 +99,33 @@
 
 // static
 CFX_DateTime CFX_DateTime::Now() {
-  FXUT_SYSTEMTIME utLocal;
+  FX_SYSTEMTIME local_time;
 #if BUILDFLAG(IS_WIN)
-  ::GetLocalTime((LPSYSTEMTIME)&utLocal);
+  ::GetLocalTime(reinterpret_cast<LPSYSTEMTIME>(&local_time));
 #elif BUILDFLAG(IS_FUCHSIA)
   // TODO(crbug.com/pdfium/1775): Implement using ICU.
 #else
-  timeval curTime;
-  gettimeofday(&curTime, nullptr);
+  timeval tv;
+  gettimeofday(&tv, nullptr);
 
   struct tm st;
-  localtime_r(&curTime.tv_sec, &st);
-  utLocal.wYear = st.tm_year + 1900;
-  utLocal.wMonth = st.tm_mon + 1;
-  utLocal.wDayOfWeek = st.tm_wday;
-  utLocal.wDay = st.tm_mday;
-  utLocal.wHour = st.tm_hour;
-  utLocal.wMinute = st.tm_min;
-  utLocal.wSecond = st.tm_sec;
-  utLocal.wMillisecond = curTime.tv_usec / 1000;
+  localtime_r(&tv.tv_sec, &st);
+  local_time.wYear = st.tm_year + 1900;
+  local_time.wMonth = st.tm_mon + 1;
+  local_time.wDayOfWeek = st.tm_wday;
+  local_time.wDay = st.tm_mday;
+  local_time.wHour = st.tm_hour;
+  local_time.wMinute = st.tm_min;
+  local_time.wSecond = st.tm_sec;
+  local_time.wMillisecond = tv.tv_usec / 1000;
 #endif  // BUILDFLAG(IS_WIN)
 
-  return CFX_DateTime(utLocal.wYear, static_cast<uint8_t>(utLocal.wMonth),
-                      static_cast<uint8_t>(utLocal.wDay),
-                      static_cast<uint8_t>(utLocal.wHour),
-                      static_cast<uint8_t>(utLocal.wMinute),
-                      static_cast<uint8_t>(utLocal.wSecond),
-                      static_cast<uint16_t>(utLocal.wMillisecond));
+  return CFX_DateTime(local_time.wYear, static_cast<uint8_t>(local_time.wMonth),
+                      static_cast<uint8_t>(local_time.wDay),
+                      static_cast<uint8_t>(local_time.wHour),
+                      static_cast<uint8_t>(local_time.wMinute),
+                      static_cast<uint8_t>(local_time.wSecond),
+                      local_time.wMillisecond);
 }
 
 int32_t CFX_DateTime::GetDayOfWeek() const {