diff options
author | Neal Norwitz <nnorwitz@gmail.com> | 2008-01-27 07:36:03 (GMT) |
---|---|---|
committer | Neal Norwitz <nnorwitz@gmail.com> | 2008-01-27 07:36:03 (GMT) |
commit | 448654f1f86ad988a28655850bf1dbb163d26730 (patch) | |
tree | 24b9d6bd5725ee10cf6402fb867538698ea07a0c | |
parent | 3e1a3736169fbd7e1a2234899faa64e5de75bc3e (diff) | |
download | cpython-448654f1f86ad988a28655850bf1dbb163d26730.zip cpython-448654f1f86ad988a28655850bf1dbb163d26730.tar.gz cpython-448654f1f86ad988a28655850bf1dbb163d26730.tar.bz2 |
Mostly reformat. Also set an error and return NULL if neither MS_WINDOWS
nor UNIX is defined. This may have caused problems on cygwin.
-rw-r--r-- | Modules/mmapmodule.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index e808d87..defef41 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -532,23 +532,21 @@ mmap_flush_method(mmap_object *self, PyObject *args) if ((size_t)(offset + size) > self->size) { PyErr_SetString(PyExc_ValueError, "flush values out of range"); return NULL; - } else { + } #ifdef MS_WINDOWS - return PyInt_FromLong((long) - FlushViewOfFile(self->data+offset, size)); -#endif /* MS_WINDOWS */ -#ifdef UNIX - /* XXX semantics of return value? */ - /* XXX flags for msync? */ - if (-1 == msync(self->data + offset, size, - MS_SYNC)) - { - PyErr_SetFromErrno(mmap_module_error); - return NULL; - } - return PyInt_FromLong(0); -#endif /* UNIX */ + return PyInt_FromLong((long) FlushViewOfFile(self->data+offset, size)); +#elif defined(UNIX) + /* XXX semantics of return value? */ + /* XXX flags for msync? */ + if (-1 == msync(self->data + offset, size, MS_SYNC)) { + PyErr_SetFromErrno(mmap_module_error); + return NULL; } + return PyInt_FromLong(0); +#else + PyErr_SetString(PyExc_ValueError, "flush not supported on this system"); + return NULL; +#endif } static PyObject * |