diff options
author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2016-09-28 17:31:35 -0400 |
---|---|---|
committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2016-09-28 17:31:35 -0400 |
commit | ada5f796e97b5a38b43571134f846366876ae54d (patch) | |
tree | da22ca57fe1c7dbbd30d2e26a2e449c6504967a5 /Python/pytime.c | |
parent | a715e303f3c1614cfeac410898df995e06dd42df (diff) | |
download | cpython-ada5f796e97b5a38b43571134f846366876ae54d.tar.gz |
Issue #28148: Stop using localtime() and gmtime() in the time module.
Introduced platform independent _PyTime_localtime API that is similar
to POSIX localtime_r, but available on all platforms. Patch by Ed
Schouten.
Diffstat (limited to 'Python/pytime.c')
-rw-r--r-- | Python/pytime.c | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/Python/pytime.c b/Python/pytime.c index 02ef8ee7d6..3015a6be0b 100644 --- a/Python/pytime.c +++ b/Python/pytime.c @@ -766,3 +766,55 @@ _PyTime_Init(void) return 0; } + +int +_PyTime_localtime(time_t t, struct tm *tm) +{ +#ifdef MS_WINDOWS + int error; + + error = localtime_s(tm, &t); + if (error != 0) { + errno = error; + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#else /* !MS_WINDOWS */ + if (localtime_r(&t, tm) == NULL) { +#ifdef EINVAL + if (errno == 0) + errno = EINVAL; +#endif + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#endif /* MS_WINDOWS */ +} + +int +_PyTime_gmtime(time_t t, struct tm *tm) +{ +#ifdef MS_WINDOWS + int error; + + error = gmtime_s(tm, &t); + if (error != 0) { + errno = error; + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#else /* !MS_WINDOWS */ + if (gmtime_r(&t, tm) == NULL) { +#ifdef EINVAL + if (errno == 0) + errno = EINVAL; +#endif + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#endif /* MS_WINDOWS */ +} |