Change time_t conversion operator to ToTime_t() function

In class CPDFSDK_DateTime, use ToTime_t() function to make the
conversion more clear.

Also, clean up the code in this class by removing buggy/unused code,
using static_cast instead of c cast etc.

Review-Url: https://codereview.chromium.org/2043873006

2 files changed, 157 insertions, 226 deletions

diff --git a/fpdfsdk/fsdk_baseannot.cpp b/fpdfsdk/fsdk_baseannot.cpp
index b628ae684f..21d85500bd 100644
--- a/fpdfsdk/fsdk_baseannot.cpp
+++ b/fpdfsdk/fsdk_baseannot.cpp
@@ -115,12 +115,12 @@ CPDFSDK_DateTime& CPDFSDK_DateTime::operator=(
 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;
 }
 
@@ -132,67 +132,7 @@ 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;
@@ -208,139 +148,135 @@ CPDFSDK_DateTime::operator time_t() {
 CPDFSDK_DateTime& CPDFSDK_DateTime::FromPDFDateTimeString(
     const CFX_ByteString& dtStr) {
   int strLength = dtStr.GetLength();
-  if (strLength > 0) {
-    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;
-    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;
-    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;
-    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;
-    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;
-    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;
-    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;
-    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;
-    if (i >= strLength || j < 2)
-      return *this;
-
-    ch = dtStr[i++];
-    if (ch != '\'')
-      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;
-    if (i >= strLength || j < 2)
-      return *this;
+  if (strLength <= 0)
+    return *this;
+
+  int i = 0;
+  while (i < strLength && !std::isdigit(dtStr[i]))
+    ++i;
+
+  if (i >= strLength)
+    return *this;
+
+  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 = 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 = 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 = 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 = 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 = 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 = 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 *= static_cast<int8_t>(k);
+  if (i >= strLength || j < 2)
+    return *this;
+
+  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 = static_cast<uint8_t>(k);
   return *this;
 }
 
@@ -376,16 +312,16 @@ CFX_ByteString CPDFSDK_DateTime::ToPDFDateTimeString() {
 }
 
 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;
   }
 }
@@ -403,17 +339,17 @@ 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;
@@ -435,15 +371,15 @@ CPDFSDK_DateTime& CPDFSDK_DateTime::AddDays(short days) {
     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;
@@ -453,8 +389,7 @@ CPDFSDK_DateTime& CPDFSDK_DateTime::AddDays(short days) {
     while (ldays >= d) {
       ldays -= d;
       m--;
-      mdays = gAfxGetMonthDays(y, m);
-      d = mdays;
+      d = gAfxGetMonthDays(y, m);
     }
     d -= ldays;
   }
@@ -481,11 +416,11 @@ CPDFSDK_DateTime& CPDFSDK_DateTime::AddSeconds(int seconds) {
     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);
 
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index 236e2c7868..752d91a903 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -37,16 +37,12 @@ class CPDFSDK_DateTime {
   CPDFSDK_DateTime& operator=(const FX_SYSTEMTIME& st);
   bool operator==(const CPDFSDK_DateTime& datetime) const;
   bool operator!=(const CPDFSDK_DateTime& datetime) const;
-  bool operator>(const CPDFSDK_DateTime& datetime) const;
-  bool operator>=(const CPDFSDK_DateTime& datetime) const;
-  bool operator<(const CPDFSDK_DateTime& datetime) const;
-  bool operator<=(const CPDFSDK_DateTime& datetime) const;
-  operator time_t();
 
   CPDFSDK_DateTime& FromPDFDateTimeString(const CFX_ByteString& dtStr);
   CFX_ByteString ToCommonDateTimeString();
   CFX_ByteString ToPDFDateTimeString();
   void ToSystemTime(FX_SYSTEMTIME& st);
+  time_t ToTime_t() const;
   CPDFSDK_DateTime ToGMT() const;
   CPDFSDK_DateTime& AddDays(short days);
   CPDFSDK_DateTime& AddSeconds(int seconds);