summaryrefslogtreecommitdiff
path: root/http/utility.hpp
diff options
context:
space:
mode:
authorNan Zhou <nanzhoumails@gmail.com>2022-01-26 23:12:59 +0300
committerEd Tanous <ed@tanous.net>2022-01-27 03:06:58 +0300
commit665479d4f1c39f1c8308a5917d0e060f605275af (patch)
treecee51769541440c9ef91ba43d016eff271655bcf /http/utility.hpp
parent9c929bea78857633f2b71b356abf4aa4b1ac56d2 (diff)
downloadbmcweb-665479d4f1c39f1c8308a5917d0e060f605275af.tar.xz
getDateTimeStdtime: fix building warnings in 32bits
Also made std::min their own lines to be more readable. Tested: unit test passes and it builds via bitbake. Signed-off-by: Nan Zhou <nanzhoumails@gmail.com> Change-Id: Ic32b886cca7c2901d77b4baffd4d4a6d655e0b14
Diffstat (limited to 'http/utility.hpp')
-rw-r--r--http/utility.hpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/http/utility.hpp b/http/utility.hpp
index 557926761c..62a4eb0f44 100644
--- a/http/utility.hpp
+++ b/http/utility.hpp
@@ -594,9 +594,8 @@ inline std::string getDateTime(boost::posix_time::milliseconds timeSinceEpoch)
// date. This behavior is to avoid exceptions throwed by Boost.
inline std::string getDateTimeUint(uint64_t secondsSinceEpoch)
{
-
- boost::posix_time::seconds boostSeconds(
- std::min(secondsSinceEpoch, details::maxSeconds));
+ secondsSinceEpoch = std::min(secondsSinceEpoch, details::maxSeconds);
+ boost::posix_time::seconds boostSeconds(secondsSinceEpoch);
return details::getDateTime(
boost::posix_time::milliseconds(boostSeconds.total_milliseconds()));
}
@@ -607,14 +606,20 @@ inline std::string getDateTimeUint(uint64_t secondsSinceEpoch)
// supported date.
inline std::string getDateTimeUintMs(uint64_t milliSecondsSinceEpoch)
{
- return details::getDateTime(boost::posix_time::milliseconds(
- std::min(details::maxMilliSeconds, milliSecondsSinceEpoch)));
+ milliSecondsSinceEpoch =
+ std::min(details::maxMilliSeconds, milliSecondsSinceEpoch);
+ return details::getDateTime(
+ boost::posix_time::milliseconds(milliSecondsSinceEpoch));
}
inline std::string getDateTimeStdtime(std::time_t secondsSinceEpoch)
{
- boost::posix_time::ptime time = boost::posix_time::from_time_t(
- std::min(secondsSinceEpoch, std::time_t{details::maxSeconds}));
+ if (secondsSinceEpoch > static_cast<int64_t>(details::maxSeconds))
+ {
+ secondsSinceEpoch = static_cast<std::time_t>(details::maxSeconds);
+ }
+ boost::posix_time::ptime time =
+ boost::posix_time::from_time_t(secondsSinceEpoch);
return boost::posix_time::to_iso_extended_string(time) + "+00:00";
}