StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use localtime_r() on Windows too." into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-06 18:12:22 +00:00
committed by Gerrit Code Review
parent 58fd788f51 16caa44298
commit 2462269f1f
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/zipalign/ZipEntry.cpp
View File

@@ -18,6 +18,8 @@
// Access to entries in a Zip archive. // Access to entries in a Zip archive.
// //
#define _POSIX_THREAD_SAFE_FUNCTIONS // For mingw localtime_r().
#define LOG_TAG "zip" #define LOG_TAG "zip"
#include "ZipEntry.h" #include "ZipEntry.h"
@@ -354,31 +356,20 @@ time_t ZipEntry::getModWhen(void) const
*/ */
void ZipEntry::setModWhen(time_t when) void ZipEntry::setModWhen(time_t when)
{ {
#if !defined(_WIN32)
struct tm tmResult;
#endif
time_t even;
uint16_t zdate, ztime;
struct tm* ptm;
/* round up to an even number of seconds */ /* round up to an even number of seconds */
even = (when & 1) ? (when + 1) : when; time_t even = (when & 1) ? (when + 1) : when;
/* expand */ /* expand */
#if !defined(_WIN32) struct tm tmResult;
ptm = localtime_r(&even, &tmResult); struct tm* ptm = localtime_r(&even, &tmResult);
#else
ptm = localtime(&even);
#endif
int year; int year;
year = ptm->tm_year; year = ptm->tm_year;
if (year < 80) if (year < 80)
year = 80; year = 80;
zdate = (year - 80) << 9 | (ptm->tm_mon+1) << 5 | ptm->tm_mday; uint16_t zdate = (year - 80) << 9 | (ptm->tm_mon+1) << 5 | ptm->tm_mday;
ztime = ptm->tm_hour << 11 | ptm->tm_min << 5 | ptm->tm_sec >> 1; uint16_t ztime = ptm->tm_hour << 11 | ptm->tm_min << 5 | ptm->tm_sec >> 1;
mCDE.mLastModFileTime = mLFH.mLastModFileTime = ztime; mCDE.mLastModFileTime = mLFH.mLastModFileTime = ztime;
mCDE.mLastModFileDate = mLFH.mLastModFileDate = zdate; mCDE.mLastModFileDate = mLFH.mLastModFileDate = zdate;