[Python-checkins] cpython: Fix io.FileIO.readall() on Windows 64 bits

victor.stinner python-checkins at python.org
Tue Oct 11 22:44:19 CEST 2011


http://hg.python.org/cpython/rev/32b1999410de
changeset:   72869:32b1999410de
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Tue Oct 11 22:45:02 2011 +0200
summary:
  Fix io.FileIO.readall() on Windows 64 bits

Use Py_off_t type (64 bits) instead of off_t (32 bits).

files:
  Modules/_io/fileio.c |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -552,12 +552,12 @@
 static size_t
 new_buffersize(fileio *self, size_t currentsize
 #ifdef HAVE_FSTAT
-               , off_t pos, off_t end
+               , Py_off_t pos, Py_off_t end
 #endif
                )
 {
 #ifdef HAVE_FSTAT
-    if (end != (off_t)-1) {
+    if (end != (Py_off_t)-1) {
         /* Files claiming a size smaller than SMALLCHUNK may
            actually be streaming pseudo-files. In this case, we
            apply the more aggressive algorithm below.
@@ -584,7 +584,7 @@
 {
 #ifdef HAVE_FSTAT
     struct stat st;
-    off_t pos, end;
+    Py_off_t pos, end;
 #endif
     PyObject *result;
     Py_ssize_t total = 0;
@@ -609,7 +609,7 @@
     if (fstat(self->fd, &st) == 0)
         end = st.st_size;
     else
-        end = (off_t)-1;
+        end = (Py_off_t)-1;
 #endif
     while (1) {
 #ifdef HAVE_FSTAT

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list