diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-04-24 23:22:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 23:22:42 (GMT) |
| commit | 0d659e5614cad512a1940125135b443b3eecb5d7 (patch) | |
| tree | 29cebf34082c5e0f748b2a177d39c6fff3f44c6b | |
| parent | 4bcfa3a2363c30d406c6826e291b30c33a649d18 (diff) | |
| download | cpython-0d659e5614cad512a1940125135b443b3eecb5d7.zip cpython-0d659e5614cad512a1940125135b443b3eecb5d7.tar.gz cpython-0d659e5614cad512a1940125135b443b3eecb5d7.tar.bz2 | |
tmtotuple(): use time_t for gmtoff (#1276)
timegm() return type is time_t, not int. Use time_t to prevent the
following compiler warning on Windows:
timemodule.c: warning C4244: '=': conversion from 'time_t' to 'int',
possible loss of data
| -rw-r--r-- | Modules/timemodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 423c001..32062a3 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -278,7 +278,7 @@ static PyTypeObject StructTimeType; static PyObject * tmtotuple(struct tm *p #ifndef HAVE_STRUCT_TM_TM_ZONE - , const char *zone, int gmtoff + , const char *zone, time_t gmtoff #endif ) { @@ -304,7 +304,7 @@ tmtotuple(struct tm *p #else PyStructSequence_SET_ITEM(v, 9, PyUnicode_DecodeLocale(zone, "surrogateescape")); - SET(10, gmtoff); + PyStructSequence_SET_ITEM(v, 10, _PyLong_FromTime_t(gmtoff)); #endif /* HAVE_STRUCT_TM_TM_ZONE */ #undef SET if (PyErr_Occurred()) { @@ -396,7 +396,7 @@ time_localtime(PyObject *self, PyObject *args) { struct tm local = buf; char zone[100]; - int gmtoff; + time_t gmtoff; strftime(zone, sizeof(zone), "%Z", &buf); gmtoff = timegm(&buf) - when; return tmtotuple(&local, zone, gmtoff); |