diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 21:49:48 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 21:49:48 (GMT) |
| commit | d430ebe1fd401ef9d0e1efa2354abedcf355135f (patch) | |
| tree | 0c76ba375bc21347d07abcf03279a3c67d2c63da /Modules/_io | |
| parent | 9137391d59abd43c87383994483e5bce80ad3226 (diff) | |
| download | cpython-d430ebe1fd401ef9d0e1efa2354abedcf355135f.zip cpython-d430ebe1fd401ef9d0e1efa2354abedcf355135f.tar.gz cpython-d430ebe1fd401ef9d0e1efa2354abedcf355135f.tar.bz2 | |
Merged revisions 75879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75879 | mark.dickinson | 2009-10-27 21:48:20 +0000 (Tue, 27 Oct 2009) | 3 lines
Silence gcc warnings when trying to print an off_t using "lld", on platforms
where off_t has type long (e.g., 64-bit Linux).
........
Diffstat (limited to 'Modules/_io')
| -rw-r--r-- | Modules/_io/_iomodule.h | 13 | ||||
| -rw-r--r-- | Modules/_io/bufferedio.c | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h index 1aa10b3..b621c51 100644 --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -70,6 +70,14 @@ 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 */ @@ -79,7 +87,7 @@ typedef PY_LONG_LONG Py_off_t; # define PY_OFF_T_MAX PY_LLONG_MAX # define PY_OFF_T_MIN PY_LLONG_MIN # define PY_PRIdOFF "lld" /* format to use in printf with type off_t */ - +# define PY_OFF_T_COMPAT long long /* standard type compatible with off_t */ #else /* Other platforms use off_t */ @@ -90,18 +98,21 @@ typedef off_t Py_off_t; # 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 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 diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 91bc83c..e9452c8 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -581,7 +581,7 @@ _buffered_raw_tell(buffered *self) if (!PyErr_Occurred()) PyErr_Format(PyExc_IOError, "Raw stream returned invalid position %" PY_PRIdOFF, - n); + (PY_OFF_T_COMPAT)n); return -1; } self->abs_pos = n; @@ -614,7 +614,7 @@ _buffered_raw_seek(buffered *self, Py_off_t target, int whence) if (!PyErr_Occurred()) PyErr_Format(PyExc_IOError, "Raw stream returned invalid position %" PY_PRIdOFF, - n); + (PY_OFF_T_COMPAT)n); return -1; } self->abs_pos = n; |