Change time_t conversion operator to ToTime_t() function

fpdfsdk/fsdk_baseannot.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
@@ skipping 97 matching lines @@
 
 CPDFSDK_DateTime& CPDFSDK_DateTime::operator=(
     const CPDFSDK_DateTime& datetime) {
   FXSYS_memcpy(&dt, &datetime.dt, sizeof(FX_DATETIME));
   return *this;
 }
 
 CPDFSDK_DateTime& CPDFSDK_DateTime::operator=(const FX_SYSTEMTIME& st) {
   tzset();
 
-  dt.year = (int16_t)st.wYear;
-  dt.month = (uint8_t)st.wMonth;
-  dt.day = (uint8_t)st.wDay;
-  dt.hour = (uint8_t)st.wHour;
-  dt.minute = (uint8_t)st.wMinute;
-  dt.second = (uint8_t)st.wSecond;
+  dt.year = static_cast<int16_t>(st.wYear);
+  dt.month = static_cast<uint8_t>(st.wMonth);
+  dt.day = static_cast<uint8_t>(st.wDay);
+  dt.hour = static_cast<uint8_t>(st.wHour);
+  dt.minute = static_cast<uint8_t>(st.wMinute);
+  dt.second = static_cast<uint8_t>(st.wSecond);
   return *this;
 }
 
 bool CPDFSDK_DateTime::operator==(const CPDFSDK_DateTime& datetime) const {
   return (FXSYS_memcmp(&dt, &datetime.dt, sizeof(FX_DATETIME)) == 0);
 }
 
 bool CPDFSDK_DateTime::operator!=(const CPDFSDK_DateTime& datetime) const {
   return !(*this == datetime);
 }
 
-bool CPDFSDK_DateTime::operator>(const CPDFSDK_DateTime& datetime) const {
-  CPDFSDK_DateTime dt1 = ToGMT();
-  CPDFSDK_DateTime dt2 = datetime.ToGMT();
-  int d1 =
-      (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
-  int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) |
-           (int)dt1.dt.second;
-  int d3 =
-      (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
-  int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) |
-           (int)dt2.dt.second;
-
-  return d1 > d3 || d2 > d4;
-}
-
-bool CPDFSDK_DateTime::operator>=(const CPDFSDK_DateTime& datetime) const {
-  CPDFSDK_DateTime dt1 = ToGMT();
-  CPDFSDK_DateTime dt2 = datetime.ToGMT();
-  int d1 =
-      (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
-  int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) |
-           (int)dt1.dt.second;
-  int d3 =
-      (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
-  int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) |
-           (int)dt2.dt.second;
-
-  return d1 >= d3 || d2 >= d4;
-}
-
-bool CPDFSDK_DateTime::operator<(const CPDFSDK_DateTime& datetime) const {
-  CPDFSDK_DateTime dt1 = ToGMT();
-  CPDFSDK_DateTime dt2 = datetime.ToGMT();
-  int d1 =
-      (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
-  int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) |
-           (int)dt1.dt.second;
-  int d3 =
-      (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
-  int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) |
-           (int)dt2.dt.second;
-
-  return d1 < d3 || d2 < d4;
-}
-
-bool CPDFSDK_DateTime::operator<=(const CPDFSDK_DateTime& datetime) const {
-  CPDFSDK_DateTime dt1 = ToGMT();
-  CPDFSDK_DateTime dt2 = datetime.ToGMT();
-  int d1 =
-      (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
-  int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) |
-           (int)dt1.dt.second;
-  int d3 =
-      (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
-  int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) |
-           (int)dt2.dt.second;
-
-  return d1 <= d3 || d2 <= d4;
-}
-
-CPDFSDK_DateTime::operator time_t() {
+time_t CPDFSDK_DateTime::ToTime_t() const {
   struct tm newtime;
 
   newtime.tm_year = dt.year - 1900;
   newtime.tm_mon = dt.month - 1;
   newtime.tm_mday = dt.day;
   newtime.tm_hour = dt.hour;
   newtime.tm_min = dt.minute;
   newtime.tm_sec = dt.second;
 
   return mktime(&newtime);
 }
 
 CPDFSDK_DateTime& CPDFSDK_DateTime::FromPDFDateTimeString(
     const CFX_ByteString& dtStr) {
   int strLength = dtStr.GetLength();
   if (strLength > 0) {

[dsinclair, 2016/06/08 13:15:13]

nit: make this an early return?

[Wei Li, 2016/06/08 16:58:56]

Done.

     int i = 0;
-    int j, k;
-    FX_CHAR ch;
     while (i < strLength && !std::isdigit(dtStr[i]))
       ++i;
 
     if (i >= strLength)
       return *this;
 
-    j = 0;
-    k = 0;
+    int j = 0;
+    int k = 0;
+    FX_CHAR ch;
     while (i < strLength && j < 4) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.year = (int16_t)k;
+    dt.year = static_cast<int16_t>(k);
     if (i >= strLength || j < 4)
       return *this;
 
     j = 0;
     k = 0;
     while (i < strLength && j < 2) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.month = (uint8_t)k;
+    dt.month = static_cast<uint8_t>(k);
     if (i >= strLength || j < 2)
       return *this;
 
     j = 0;
     k = 0;
     while (i < strLength && j < 2) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.day = (uint8_t)k;
+    dt.day = static_cast<uint8_t>(k);
     if (i >= strLength || j < 2)
       return *this;
 
     j = 0;
     k = 0;
     while (i < strLength && j < 2) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.hour = (uint8_t)k;
+    dt.hour = static_cast<uint8_t>(k);
     if (i >= strLength || j < 2)
       return *this;
 
     j = 0;
     k = 0;
     while (i < strLength && j < 2) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.minute = (uint8_t)k;
+    dt.minute = static_cast<uint8_t>(k);
     if (i >= strLength || j < 2)
       return *this;
 
     j = 0;
     k = 0;
     while (i < strLength && j < 2) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.second = (uint8_t)k;
+    dt.second = static_cast<uint8_t>(k);
     if (i >= strLength || j < 2)
       return *this;
 
     ch = dtStr[i++];
     if (ch != '-' && ch != '+')
       return *this;
     if (ch == '-')
       dt.tzHour = -1;
     else
       dt.tzHour = 1;
     j = 0;
     k = 0;
     while (i < strLength && j < 2) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.tzHour *= (FX_CHAR)k;
+    dt.tzHour *= static_cast<int8_t>(k);
     if (i >= strLength || j < 2)
       return *this;
 
-    ch = dtStr[i++];
-    if (ch != '\'')
+    if (dtStr[i++] != '\'')
       return *this;
     j = 0;
     k = 0;
     while (i < strLength && j < 2) {
       ch = dtStr[i];
       k = k * 10 + FXSYS_toDecimalDigit(ch);
       j++;
       if (!std::isdigit(ch))
         break;
       i++;
     }
-    dt.tzMinute = (uint8_t)k;
+    dt.tzMinute = static_cast<uint8_t>(k);
     if (i >= strLength || j < 2)
       return *this;
   }
 
   return *this;
 }
 
 CFX_ByteString CPDFSDK_DateTime::ToCommonDateTimeString() {
   CFX_ByteString str1;
   str1.Format("%04d-%02u-%02u %02u:%02u:%02u ", dt.year, dt.month, dt.day,
@@ skipping 19 matching lines @@
   else
     dtStr += CFX_ByteString("+");
   memset(tempStr, 0, sizeof(tempStr));
   FXSYS_snprintf(tempStr, sizeof(tempStr) - 1, "%02d'%02u'", abs(dt.tzHour),
                  dt.tzMinute);
   dtStr += CFX_ByteString(tempStr);
   return dtStr;
 }
 
 void CPDFSDK_DateTime::ToSystemTime(FX_SYSTEMTIME& st) {
-  time_t t = (time_t)(*this);
+  time_t t = this->ToTime_t();
   struct tm* pTime = localtime(&t);
   if (pTime) {
-    st.wYear = (uint16_t)pTime->tm_year + 1900;
-    st.wMonth = (uint16_t)pTime->tm_mon + 1;
-    st.wDay = (uint16_t)pTime->tm_mday;
-    st.wDayOfWeek = (uint16_t)pTime->tm_wday;
-    st.wHour = (uint16_t)pTime->tm_hour;
-    st.wMinute = (uint16_t)pTime->tm_min;
-    st.wSecond = (uint16_t)pTime->tm_sec;
+    st.wYear = static_cast<uint16_t>(pTime->tm_year) + 1900;
+    st.wMonth = static_cast<uint16_t>(pTime->tm_mon) + 1;
+    st.wDay = static_cast<uint16_t>(pTime->tm_mday);
+    st.wDayOfWeek = static_cast<uint16_t>(pTime->tm_wday);
+    st.wHour = static_cast<uint16_t>(pTime->tm_hour);
+    st.wMinute = static_cast<uint16_t>(pTime->tm_min);
+    st.wSecond = static_cast<uint16_t>(pTime->tm_sec);
     st.wMilliseconds = 0;
   }
 }
 
 CPDFSDK_DateTime CPDFSDK_DateTime::ToGMT() const {
   CPDFSDK_DateTime new_dt = *this;
   new_dt.AddSeconds(
       -gAfxGetTimeZoneInSeconds(new_dt.dt.tzHour, new_dt.dt.tzMinute));
   new_dt.dt.tzHour = 0;
   new_dt.dt.tzMinute = 0;
   return new_dt;
 }
 
 CPDFSDK_DateTime& CPDFSDK_DateTime::AddDays(short days) {
   if (days == 0)
     return *this;
 
-  int16_t y = dt.year, yy;
+  int16_t y = dt.year;
   uint8_t m = dt.month;
   uint8_t d = dt.day;
-  int mdays, ydays, ldays;
 
-  ldays = days;
+  int ldays = days;
   if (ldays > 0) {
-    yy = y;
-    if (((uint16_t)m * 100 + d) > 300)
+    int16_t yy = y;
+    if ((static_cast<uint16_t>(m) * 100 + d) > 300)
       yy++;
-    ydays = gAfxGetYearDays(yy);
+    int ydays = gAfxGetYearDays(yy);
+    int mdays;
     while (ldays >= ydays) {
       y++;
       ldays -= ydays;
       yy++;
       mdays = gAfxGetMonthDays(y, m);
       if (d > mdays) {
         m++;
         d -= mdays;
       }
       ydays = gAfxGetYearDays(yy);
     }
     mdays = gAfxGetMonthDays(y, m) - d + 1;
     while (ldays >= mdays) {
       ldays -= mdays;
       m++;
       d = 1;
       mdays = gAfxGetMonthDays(y, m);
     }
     d += ldays;
   } else {
     ldays *= -1;
-    yy = y;
-    if (((uint16_t)m * 100 + d) < 300)
+    int16_t yy = y;
+    if ((static_cast<uint16_t>(m) * 100 + d) < 300)
       yy--;
-    ydays = gAfxGetYearDays(yy);
+    int ydays = gAfxGetYearDays(yy);
     while (ldays >= ydays) {
       y--;
       ldays -= ydays;
       yy--;
-      mdays = gAfxGetMonthDays(y, m);
+      int mdays = gAfxGetMonthDays(y, m);
       if (d > mdays) {
         m++;
         d -= mdays;
       }
       ydays = gAfxGetYearDays(yy);
     }
     while (ldays >= d) {
       ldays -= d;
       m--;
-      mdays = gAfxGetMonthDays(y, m);
-      d = mdays;
+      d = gAfxGetMonthDays(y, m);
     }
     d -= ldays;
   }
 
   dt.year = y;
   dt.month = m;
   dt.day = d;
 
   return *this;
 }
 
 CPDFSDK_DateTime& CPDFSDK_DateTime::AddSeconds(int seconds) {
   if (seconds == 0)
     return *this;
 
   int n;
   int days;
 
   n = dt.hour * 3600 + dt.minute * 60 + dt.second + seconds;
   if (n < 0) {
     days = (n - 86399) / 86400;
     n -= days * 86400;
   } else {
     days = n / 86400;
     n %= 86400;
   }
-  dt.hour = (uint8_t)(n / 3600);
+  dt.hour = static_cast<uint8_t>(n / 3600);
   dt.hour %= 24;
   n %= 3600;
-  dt.minute = (uint8_t)(n / 60);
-  dt.second = (uint8_t)(n % 60);
+  dt.minute = static_cast<uint8_t>(n / 60);
+  dt.second = static_cast<uint8_t>(n % 60);
   if (days != 0)
     AddDays(days);
 
   return *this;
 }
 
 CPDFSDK_Annot::CPDFSDK_Annot(CPDFSDK_PageView* pPageView)
     : m_pPageView(pPageView), m_bSelected(FALSE), m_nTabOrder(-1) {}
 
 CPDFSDK_BAAnnot::CPDFSDK_BAAnnot(CPDF_Annot* pAnnot,
@@ skipping 428 matching lines @@
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
   return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
 }
 
 #ifdef PDF_ENABLE_XFA
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() {
   return m_pPageView ? m_pPageView->GetPDFXFAPage() : nullptr;
 }
 #endif  // PDF_ENABLE_XFA