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

Merged revisions 76502 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76502 | mark.dickinson | 2009-11-24 20:51:48 +0000 (Tue, 24 Nov 2009) | 3 lines

  Issue #7228:  Fix format mismatch when printing something of type off_t.
  (Should silence some compiler warnings.)
........
This commit is contained in:
Mark Dickinson 2009-11-24 20:54:11 +00:00
parent db0401c1aa
commit 1a0aaaabb6
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/_io/_iomodule.h
View File

@ -70,6 +70,14 @@ PyAPI_DATA(PyObject *) PyExc_BlockingIOError;
* Offset type for positioning. * Offset type for positioning.
*/ */
/* Printing a variable of type off_t (with e.g., PyString_FromFormat)
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. 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) #if defined(MS_WIN64) || defined(MS_WINDOWS)
/* Windows uses long long for offsets */ /* Windows uses long long for offsets */
@ -78,6 +86,8 @@ typedef PY_LONG_LONG Py_off_t;
# define PyLong_FromOff_t PyLong_FromLongLong # define PyLong_FromOff_t PyLong_FromLongLong
# define PY_OFF_T_MAX PY_LLONG_MAX # define PY_OFF_T_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN # define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_OFF_T_COMPAT PY_LONG_LONG /* type compatible with off_t */
# define PY_PRIdOFF "lld" /* format to use for that type */
#else #else
@ -88,16 +98,22 @@ typedef off_t Py_off_t;
# define PyLong_FromOff_t PyLong_FromSsize_t # define PyLong_FromOff_t PyLong_FromSsize_t
# define PY_OFF_T_MAX PY_SSIZE_T_MAX # define PY_OFF_T_MAX PY_SSIZE_T_MAX
# define PY_OFF_T_MIN PY_SSIZE_T_MIN # define PY_OFF_T_MIN PY_SSIZE_T_MIN
#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG) # define PY_OFF_T_COMPAT Py_ssize_t
# define PY_PRIdOFF "zd"
#elif (HAVE_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG)
# define PyLong_AsOff_t PyLong_AsLongLong # define PyLong_AsOff_t PyLong_AsLongLong
# define PyLong_FromOff_t PyLong_FromLongLong # define PyLong_FromOff_t PyLong_FromLongLong
# define PY_OFF_T_MAX PY_LLONG_MAX # define PY_OFF_T_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN # define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_OFF_T_COMPAT PY_LONG_LONG
# define PY_PRIdOFF "lld"
#elif (SIZEOF_OFF_T == SIZEOF_LONG) #elif (SIZEOF_OFF_T == SIZEOF_LONG)
# define PyLong_AsOff_t PyLong_AsLong # define PyLong_AsOff_t PyLong_AsLong
# define PyLong_FromOff_t PyLong_FromLong # define PyLong_FromOff_t PyLong_FromLong
# define PY_OFF_T_MAX LONG_MAX # define PY_OFF_T_MAX LONG_MAX
# define PY_OFF_T_MIN LONG_MIN # define PY_OFF_T_MIN LONG_MIN
# define PY_OFF_T_COMPAT long
# define PY_PRIdOFF "ld"
#else #else
# error off_t does not match either size_t, long, or long long! # error off_t does not match either size_t, long, or long long!
#endif #endif

6
Modules/_io/bufferedio.c
View File

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