godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace calls to gmtime with gmtime_r and localtime with localtime_r. 

(cherry picked from commit 4b3aec50c0)
This commit is contained in:
Marcel Admiraal 2020-09-04 12:22:43 +01:00 committed by Rémi Verschelde
parent c6ee088431
commit 5f1dd48496
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/unix/os_unix.cpp
View File

@ -194,52 +194,54 @@ uint64_t OS_Unix::get_system_time_msecs() const {
} }
OS::Date OS_Unix::get_date(bool utc) const { OS::Date OS_Unix::get_date(bool utc) const {
time_t t = time(NULL); time_t t = time(NULL);
struct tm *lt; struct tm lt;
if (utc) if (utc) {
lt = gmtime(&t); gmtime_r(&t, &lt);
else } else {
lt = localtime(&t); localtime_r(&t, &lt);
}
Date ret; Date ret;
ret.year = 1900 + lt->tm_year; ret.year = 1900 + lt.tm_year;
// Index starting at 1 to match OS_Unix::get_date // Index starting at 1 to match OS_Unix::get_date
// and Windows SYSTEMTIME and tm_mon follows the typical structure // and Windows SYSTEMTIME and tm_mon follows the typical structure
// of 0-11, noted here: http://www.cplusplus.com/reference/ctime/tm/ // of 0-11, noted here: http://www.cplusplus.com/reference/ctime/tm/
ret.month = (Month)(lt->tm_mon + 1); ret.month = (Month)(lt.tm_mon + 1);
ret.day = lt->tm_mday; ret.day = lt.tm_mday;
ret.weekday = (Weekday)lt->tm_wday; ret.weekday = (Weekday)lt.tm_wday;
ret.dst = lt->tm_isdst; ret.dst = lt.tm_isdst;
return ret; return ret;
} }
OS::Time OS_Unix::get_time(bool utc) const { OS::Time OS_Unix::get_time(bool utc) const {
time_t t = time(NULL); time_t t = time(NULL);
struct tm *lt; struct tm lt;
if (utc) if (utc) {
lt = gmtime(&t); gmtime_r(&t, &lt);
else } else {
lt = localtime(&t); localtime_r(&t, &lt);
}
Time ret; Time ret;
ret.hour = lt->tm_hour; ret.hour = lt.tm_hour;
ret.min = lt->tm_min; ret.min = lt.tm_min;
ret.sec = lt->tm_sec; ret.sec = lt.tm_sec;
get_time_zone_info(); get_time_zone_info();
return ret; return ret;
} }
OS::TimeZoneInfo OS_Unix::get_time_zone_info() const { OS::TimeZoneInfo OS_Unix::get_time_zone_info() const {
time_t t = time(NULL); time_t t = time(NULL);
struct tm *lt = localtime(&t); struct tm lt;
localtime_r(&t, &lt);
char name[16]; char name[16];
strftime(name, 16, "%Z", lt); strftime(name, 16, "%Z", &lt);
name[15] = 0; name[15] = 0;
TimeZoneInfo ret; TimeZoneInfo ret;
ret.name = name; ret.name = name;
char bias_buf[16]; char bias_buf[16];
strftime(bias_buf, 16, "%z", lt); strftime(bias_buf, 16, "%z", &lt);
int bias; int bias;
bias_buf[15] = 0; bias_buf[15] = 0;
sscanf(bias_buf, "%d", &bias); sscanf(bias_buf, "%d", &bias);