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

Merged revisions 75881 via svnmerge from 

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

................
  r75881 | mark.dickinson | 2009-10-27 21:49:48 +0000 (Tue, 27 Oct 2009) | 10 lines

  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).
  ........
................
This commit is contained in:
Mark Dickinson 2009-10-27 21:51:51 +00:00
parent 227c4858bc
commit 121fbe4745
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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 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) #if defined(MS_WIN64) || defined(MS_WINDOWS)
/* Windows uses long long for offsets */ /* 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_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN # define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_PRIdOFF "lld" /* format to use in printf with type off_t */ # 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 #else
/* Other platforms use off_t */ /* 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_MAX PY_LLONG_MAX
# define PY_OFF_T_MIN PY_LLONG_MIN # define PY_OFF_T_MIN PY_LLONG_MIN
# define PY_PRIdOFF "lld" # define PY_PRIdOFF "lld"
# define PY_OFF_T_COMPAT long long
#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_PRIdOFF "ld" # define PY_PRIdOFF "ld"
# define PY_OFF_T_COMPAT long
#elif (SIZEOF_OFF_T == SIZEOF_SIZE_T) #elif (SIZEOF_OFF_T == SIZEOF_SIZE_T)
# define PyLong_AsOff_t PyLong_AsSsize_t # define PyLong_AsOff_t PyLong_AsSsize_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
# define PY_PRIdOFF "zd" # define PY_PRIdOFF "zd"
# define PY_OFF_T_COMPAT Py_ssize_t
#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

4
Modules/_io/bufferedio.c
View File

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