]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Mostly reformat. Also set an error and return NULL if neither MS_WINDOWS
authorNeal Norwitz <nnorwitz@gmail.com>
Sun, 27 Jan 2008 07:36:03 +0000 (07:36 +0000)
committerNeal Norwitz <nnorwitz@gmail.com>
Sun, 27 Jan 2008 07:36:03 +0000 (07:36 +0000)
nor UNIX is defined.  This may have caused problems on cygwin.

Modules/mmapmodule.c

index e808d875852a5735b454bb4b0fc255a56b5abe22..defef4111120c6cb4445ce414915e3c13cf246fe 100644 (file)
@@ -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 *