diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-11-24 20:54:11 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-11-24 20:54:11 (GMT) |
| commit | 1a0aaaabb6a6612cf0035588542895fe3a934b90 (patch) | |
| tree | f665125bbd32834e5bbc61c033c450be8154cca0 /Modules/_io/_iomodule.h | |
| parent | db0401c1aa8750e4e9a3573974ac1fc7a32319c5 (diff) | |
| download | cpython-1a0aaaabb6a6612cf0035588542895fe3a934b90.zip cpython-1a0aaaabb6a6612cf0035588542895fe3a934b90.tar.gz cpython-1a0aaaabb6a6612cf0035588542895fe3a934b90.tar.bz2 | |
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.)
........
Diffstat (limited to 'Modules/_io/_iomodule.h')
| -rw-r--r-- | Modules/_io/_iomodule.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h index bc0e452..3e939a3 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 (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) /* Windows uses long long for offsets */ @@ -78,6 +86,8 @@ 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_OFF_T_COMPAT PY_LONG_LONG /* type compatible with off_t */ +# define PY_PRIdOFF "lld" /* format to use for that type */ #else @@ -88,16 +98,22 @@ typedef off_t Py_off_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 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_FromOff_t PyLong_FromLongLong # define PY_OFF_T_MAX PY_LLONG_MAX # 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) # 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_OFF_T_COMPAT long +# define PY_PRIdOFF "ld" #else # error off_t does not match either size_t, long, or long long! #endif |