mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 03:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

time: fix gcc warning

Browse source 
* Create format_arg variable to use the right types
 * Strip trailing spaces
This commit is contained in:
Victor Stinner 2010-10-07 01:00:52 +00:00
parent 4726e40e00
commit ef12810f0c
1 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Modules/timemodule.c
View file

@ -472,6 +472,7 @@ time_strftime(PyObject *self, PyObject *args)
#else
PyObject *format;
#endif
PyObject *format_arg;
size_t fmtlen, buflen;
time_char *outbuf = NULL;
size_t i;
@ -482,7 +483,7 @@ time_strftime(PyObject *self, PyObject *args)
/* Will always expect a unicode string to be passed as format.
Given that there's no str type anymore in py3k this seems safe.
*/
if (!PyArg_ParseTuple(args, "U|O:strftime", &format, &tup))
if (!PyArg_ParseTuple(args, "U|O:strftime", &format_arg, &tup))
return NULL;
if (tup == NULL) {
@ -501,13 +502,13 @@ time_strftime(PyObject *self, PyObject *args)
buf.tm_isdst = 1;
#ifdef HAVE_WCSFTIME
format = PyUnicode_AsWideCharString((PyUnicodeObject*)format, NULL);
format = PyUnicode_AsWideCharString((PyUnicodeObject*)format_arg, NULL);
if (format == NULL)
return NULL;
fmt = format;
#else
/* Convert the unicode string to an ascii one */
format = PyUnicode_AsEncodedString(format, TZNAME_ENCODING, NULL);
format = PyUnicode_AsEncodedString(format_arg, TZNAME_ENCODING, NULL);
if (format == NULL)
return NULL;
fmt = PyBytes_AS_STRING(format);