diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 18:43:44 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 18:43:44 (GMT) |
| commit | 6576848855ddd8d7788ec0ad18d386572f27a492 (patch) | |
| tree | 494846c9ac0f1a5cc57fe5b5a04ab79a29c095f1 /Modules | |
| parent | 22b3e25dae2896750b4f2c18f02a98e8602985f6 (diff) | |
| download | cpython-6576848855ddd8d7788ec0ad18d386572f27a492.zip cpython-6576848855ddd8d7788ec0ad18d386572f27a492.tar.gz cpython-6576848855ddd8d7788ec0ad18d386572f27a492.tar.bz2 | |
Merged revisions 75729 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75729 | mark.dickinson | 2009-10-26 20:02:55 +0000 (Mon, 26 Oct 2009) | 10 lines
Merged revisions 75728 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75728 | mark.dickinson | 2009-10-26 19:59:23 +0000 (Mon, 26 Oct 2009) | 3 lines
Use correct conversion specifier and length modifier when printing an
integer of type off_t. Also, don't assume that long long is available.
........
................
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_io/_iomodule.h | 16 | ||||
| -rw-r--r-- | Modules/_io/bufferedio.c | 6 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h index bc0e452..1aa10b3 100644 --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -78,26 +78,30 @@ 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 "lld" /* format to use in printf with type off_t */ #else /* Other platforms use off_t */ typedef off_t Py_off_t; -#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) +#if (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_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_PRIdOFF "ld" +#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" #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 d8b6471..41a14e4 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -580,7 +580,8 @@ _buffered_raw_tell(buffered *self) if (n < 0) { if (!PyErr_Occurred()) PyErr_Format(PyExc_IOError, - "Raw stream returned invalid position %zd", n); + "Raw stream returned invalid position %" PY_PRIdOFF, + n); return -1; } self->abs_pos = n; @@ -612,7 +613,8 @@ _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 %zd", n); + "Raw stream returned invalid position %" PY_PRIdOFF, + n); return -1; } self->abs_pos = n; |