AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up use of local variables and add an assertion

Browse Source 
Petty tidy-up, narrowing the scopes and asserting that localtime_r()'s
return, when non-null, is the pointer we gave it.

Change-Id: I6c0959524260028ca9b234f6d33eae78f27c1412
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-08-10 17:50:44 +02:00
parent 1b4a5af63f
commit 1f96709fdb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/time/qdatetime.cpp
View File

@ -2491,19 +2491,17 @@ static bool qt_localtime(qint64 msecsSinceEpoch, QDate *localDate, QTime *localT
#if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
// Use the reentrant version of localtime() where available
// as is thread-safe and doesn't use a shared static data area
tm *res = nullptr;
res = localtime_r(&secsSinceEpoch, &local);
if (res)
if (tm *res = localtime_r(&secsSinceEpoch, &local)) {
Q_ASSERT(res == &local);
valid = true;
}
#elif defined(Q_CC_MSVC)
if (!_localtime64_s(&local, &secsSinceEpoch))
valid = true;
#else
// Returns shared static data which may be overwritten at any time
// So copy the result asap
tm *res = nullptr;
res = localtime(&secsSinceEpoch);
if (res) {
if (tm *res = localtime(&secsSinceEpoch)) {
local = *res;
valid = true;
}