From e1b60d4849111f5e1bacb1cf511ec7e7e97c205b Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Mon, 5 Oct 2009 21:09:00 +0000 Subject: [PATCH] Merged revisions 75258 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75258 | amaury.forgeotdarc | 2009-10-05 22:18:05 +0200 (lun., 05 oct. 2009) | 2 lines Fix compilation warning on Windows, where size_t is 32bit but file offsets are 64bit. ........ --- Modules/_io/bufferedio.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index d8b6471fd7f..3dec67b5c6b 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -1688,7 +1688,8 @@ bufferedwriter_write(buffered *self, PyObject *args) { PyObject *res = NULL; Py_buffer buf; - Py_ssize_t written, avail, remaining, n; + Py_ssize_t written, avail, remaining; + Py_off_t offset; CHECK_INITIALIZED(self) if (!PyArg_ParseTuple(args, "y*:write", &buf)) { @@ -1763,18 +1764,18 @@ bufferedwriter_write(buffered *self, PyObject *args) the raw stream by itself). Fixes issue #6629. */ - n = RAW_OFFSET(self); - if (n != 0) { - if (_buffered_raw_seek(self, -n, 1) < 0) + offset = RAW_OFFSET(self); + if (offset != 0) { + if (_buffered_raw_seek(self, -offset, 1) < 0) goto error; - self->raw_pos -= n; + self->raw_pos -= offset; } /* Then write buf itself. At this point the buffer has been emptied. */ remaining = buf.len; written = 0; while (remaining > self->buffer_size) { - n = _bufferedwriter_raw_write( + Py_ssize_t n = _bufferedwriter_raw_write( self, (char *) buf.buf + written, buf.len - written); if (n == -1) { Py_ssize_t *w = _buffered_check_blocking_error();