summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-10-05 20:18:05 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-10-05 20:18:05 (GMT)
commit3de464702220bf4256d8ab0a0c9a3c00831c8bcd (patch)
treecf545706d0dec2ed62c3cf7c5f5c13a6279fd287
parentabe3d3ec85893dcb6c0e5851fc607ced61b3336e (diff)
downloadcpython-3de464702220bf4256d8ab0a0c9a3c00831c8bcd.zip
cpython-3de464702220bf4256d8ab0a0c9a3c00831c8bcd.tar.gz
cpython-3de464702220bf4256d8ab0a0c9a3c00831c8bcd.tar.bz2
Fix compilation warning on Windows, where size_t is 32bit but file offsets are 64bit.
-rw-r--r--Modules/_io/bufferedio.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 6e5e0fa..040f3bf 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -1705,7 +1705,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, "s*:write", &buf)) {
@@ -1780,18 +1781,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();