Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 75941 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75941 | mark.dickinson | 2009-10-29 09:58:06 +0000 (Thu, 29 Oct 2009) | 11 lines

  Merged revisions 75939 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75939 | mark.dickinson | 2009-10-29 09:46:04 +0000 (Thu, 29 Oct 2009) | 5 lines

    Roll back ill-considered attempts to fix printf specifier mismatch for off_t.
    The sensible solution seems to be to implement %lld for PyString_FromFormat(V)
    and PyErr_Format.  See issue #7228.
  ........
................
This commit is contained in:
Mark Dickinson 2009-10-29 10:01:23 +00:00
parent ab65087bea
commit 00de1bdcfc
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Modules/_io/_iomodule.h
View File

@ -70,14 +70,6 @@ PyAPI_DATA(PyObject *) PyExc_BlockingIOError;
* Offset type for positioning.
*/
/* Printing a variable of type off_t correctly and without producing
compiler warnings is surprisingly painful. We identify an integer
type whose size matches off_t and then: (1) cast the off_t to that
integer type and (2) use the appropriate conversion specification
for printf. The cast is necessary: gcc complains about formatting
a long with "%lld" even when both long and long long have the same
precision. */
#if defined(MS_WIN64) || defined(MS_WINDOWS)
/* Windows uses long long for offsets */
@ -86,33 +78,26 @@ typedef PY_LONG_LONG Py_off_t;
# define PyLong_FromOff_t PyLong_FromLongLong
# define PY_OFF_T_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_PRIdOFF "I64d" /* format to use in printf with type off_t */
# define PY_OFF_T_COMPAT PY_LONG_LONG /* type compatible with off_t */
#else
/* Other platforms use off_t */
typedef off_t Py_off_t;
#if (HAVE_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG)
#if (SIZEOF_OFF_T == SIZEOF_SIZE_T)
# define PyLong_AsOff_t PyLong_AsSsize_t
# define PyLong_FromOff_t PyLong_FromSsize_t
# define PY_OFF_T_MAX PY_SSIZE_T_MAX
# define PY_OFF_T_MIN PY_SSIZE_T_MIN
#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG)
# define PyLong_AsOff_t PyLong_AsLongLong
# define PyLong_FromOff_t PyLong_FromLongLong
# define PY_OFF_T_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_PRIdOFF "lld"
# define PY_OFF_T_COMPAT PY_LONG_LONG
#elif (SIZEOF_OFF_T == SIZEOF_LONG)
# define PyLong_AsOff_t PyLong_AsLong
# define PyLong_FromOff_t PyLong_FromLong
# define PY_OFF_T_MAX LONG_MAX
# define PY_OFF_T_MIN LONG_MIN
# define PY_PRIdOFF "ld"
# define PY_OFF_T_COMPAT long
#elif (SIZEOF_OFF_T == SIZEOF_SIZE_T)
# define PyLong_AsOff_t PyLong_AsSsize_t
# define PyLong_FromOff_t PyLong_FromSsize_t
# define PY_OFF_T_MAX PY_SSIZE_T_MAX
# define PY_OFF_T_MIN PY_SSIZE_T_MIN
# define PY_PRIdOFF "zd"
# define PY_OFF_T_COMPAT Py_ssize_t
#else
# error off_t does not match either size_t, long, or long long!
#endif

6
Modules/_io/bufferedio.c
View File

@ -580,8 +580,7 @@ _buffered_raw_tell(buffered *self)
if (n < 0) {
if (!PyErr_Occurred())
PyErr_Format(PyExc_IOError,
"Raw stream returned invalid position %" PY_PRIdOFF,
(PY_OFF_T_COMPAT)n);
"Raw stream returned invalid position %zd", n);
return -1;
}
self->abs_pos = n;
@ -613,8 +612,7 @@ _buffered_raw_seek(buffered *self, Py_off_t target, int whence)
if (n < 0) {
if (!PyErr_Occurred())
PyErr_Format(PyExc_IOError,
"Raw stream returned invalid position %" PY_PRIdOFF,
(PY_OFF_T_COMPAT)n);
"Raw stream returned invalid position %zd", n);
return -1;
}
self->abs_pos = n;