1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize SYSTEMTIME to {} instead of memset()ing

Browse Source 
Change-Id: Ic17b90d10d6b5b7f4610e904e18979fc1d658a0a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2021-05-19 16:39:29 +02:00 committed by Andreas Buhr
parent e16afd66fc
commit 55765898fe
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4669,8 +4669,7 @@ static inline uint msecsFromDecomposed(int hour, int minute, int sec, int msec =
QDate QDate::currentDate() QDate QDate::currentDate()
{ {
SYSTEMTIME st; SYSTEMTIME st = {};
memset(&st, 0, sizeof(SYSTEMTIME));
GetLocalTime(&st); GetLocalTime(&st);
return QDate(st.wYear, st.wMonth, st.wDay); return QDate(st.wYear, st.wMonth, st.wDay);
} }
@ -4678,8 +4677,7 @@ QDate QDate::currentDate()
QTime QTime::currentTime() QTime QTime::currentTime()
{ {
QTime ct; QTime ct;
SYSTEMTIME st; SYSTEMTIME st = {};
memset(&st, 0, sizeof(SYSTEMTIME));
GetLocalTime(&st); GetLocalTime(&st);
ct.setHMS(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); ct.setHMS(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
return ct; return ct;
@ -4688,8 +4686,7 @@ QTime QTime::currentTime()
QDateTime QDateTime::currentDateTime() QDateTime QDateTime::currentDateTime()
{ {
QTime t; QTime t;
SYSTEMTIME st; SYSTEMTIME st = {};
memset(&st, 0, sizeof(SYSTEMTIME));
GetLocalTime(&st); GetLocalTime(&st);
QDate d(st.wYear, st.wMonth, st.wDay); QDate d(st.wYear, st.wMonth, st.wDay);
t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
@ -4699,8 +4696,7 @@ QDateTime QDateTime::currentDateTime()
QDateTime QDateTime::currentDateTimeUtc() QDateTime QDateTime::currentDateTimeUtc()
{ {
QTime t; QTime t;
SYSTEMTIME st; SYSTEMTIME st = {};
memset(&st, 0, sizeof(SYSTEMTIME));
GetSystemTime(&st); GetSystemTime(&st);
QDate d(st.wYear, st.wMonth, st.wDay); QDate d(st.wYear, st.wMonth, st.wDay);
t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); t.mds = msecsFromDecomposed(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
@ -4709,8 +4705,7 @@ QDateTime QDateTime::currentDateTimeUtc()
qint64 QDateTime::currentMSecsSinceEpoch() noexcept qint64 QDateTime::currentMSecsSinceEpoch() noexcept
{ {
SYSTEMTIME st; SYSTEMTIME st = {};
memset(&st, 0, sizeof(SYSTEMTIME));
GetSystemTime(&st); GetSystemTime(&st);
const qint64 daysAfterEpoch = QDate(1970, 1, 1).daysTo(QDate(st.wYear, st.wMonth, st.wDay)); const qint64 daysAfterEpoch = QDate(1970, 1, 1).daysTo(QDate(st.wYear, st.wMonth, st.wDay));
@ -4720,8 +4715,7 @@ qint64 QDateTime::currentMSecsSinceEpoch() noexcept
qint64 QDateTime::currentSecsSinceEpoch() noexcept qint64 QDateTime::currentSecsSinceEpoch() noexcept
{ {
SYSTEMTIME st; SYSTEMTIME st = {};
memset(&st, 0, sizeof(SYSTEMTIME));
GetSystemTime(&st); GetSystemTime(&st);
const qint64 daysAfterEpoch = QDate(1970, 1, 1).daysTo(QDate(st.wYear, st.wMonth, st.wDay)); const qint64 daysAfterEpoch = QDate(1970, 1, 1).daysTo(QDate(st.wYear, st.wMonth, st.wDay));