traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

timemodule.c: Cast PyUnicode_AsUTF8() to char* (#1294) 

bpo-28769 changed PyUnicode_AsUTF8() return type from const char* to
char* in Python 3.7, but tm_zone field type of the tm structure is
char* on FreeBSD.

Cast PyUnicode_AsUTF8() to char* in gettmarg() to fix the warning:

    Modules/timemodule.c:443:20: warning: assigning to 'char *'
    from 'const char *' discards qualifiers
This commit is contained in:
Victor Stinner 2017-04-26 13:51:48 +02:00 committed by GitHub
parent 87c07fe9d9
commit 6e676954de
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/timemodule.c
View File

@ -440,7 +440,7 @@ gettmarg(PyObject *args, struct tm *p)
if (Py_TYPE(args) == &StructTimeType) { if (Py_TYPE(args) == &StructTimeType) {
PyObject *item; PyObject *item;
item = PyTuple_GET_ITEM(args, 9); item = PyTuple_GET_ITEM(args, 9);
p->tm_zone = item == Py_None ? NULL : PyUnicode_AsUTF8(item); p->tm_zone = item == Py_None ? NULL : (char*)PyUnicode_AsUTF8(item);
item = PyTuple_GET_ITEM(args, 10); item = PyTuple_GET_ITEM(args, 10);
p->tm_gmtoff = item == Py_None ? 0 : PyLong_AsLong(item); p->tm_gmtoff = item == Py_None ? 0 : PyLong_AsLong(item);
if (PyErr_Occurred()) if (PyErr_Occurred())