Commit 6fef30e1 authored by Andrew M. Kuchling's avatar Andrew M. Kuchling

Support resizing the mapping depending on whether HAVE_MREMAP is defined

Remove two unused variables
parent 1d158695
...@@ -334,7 +334,7 @@ mmap_resize_method (mmap_object * self, ...@@ -334,7 +334,7 @@ mmap_resize_method (mmap_object * self,
#endif /* MS_WIN32 */ #endif /* MS_WIN32 */
#ifdef UNIX #ifdef UNIX
#ifndef MREMAP_MAYMOVE #ifndef HAVE_MREMAP
} else { } else {
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SystemError,
"mmap: resizing not available--no mremap()"); "mmap: resizing not available--no mremap()");
...@@ -343,7 +343,11 @@ mmap_resize_method (mmap_object * self, ...@@ -343,7 +343,11 @@ mmap_resize_method (mmap_object * self,
} else { } else {
void *newmap; void *newmap;
#ifdef MREMAP_MAYMOVE
newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE); newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
#else
newmap = mremap(self->data, self->size, new_size, 0);
#endif
if (newmap == (void *)-1) if (newmap == (void *)-1)
{ {
PyErr_SetFromErrno(mmap_module_error); PyErr_SetFromErrno(mmap_module_error);
...@@ -353,7 +357,7 @@ mmap_resize_method (mmap_object * self, ...@@ -353,7 +357,7 @@ mmap_resize_method (mmap_object * self,
self->size = new_size; self->size = new_size;
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
#endif /* MREMAP_MAYMOVE */ #endif /* HAVE_MREMAP */
#endif /* UNIX */ #endif /* UNIX */
} }
} }
...@@ -774,8 +778,6 @@ new_mmap_object (PyObject * self, PyObject * args, PyObject *kwdict) ...@@ -774,8 +778,6 @@ new_mmap_object (PyObject * self, PyObject * args, PyObject *kwdict)
PyObject *map_size_obj = NULL; PyObject *map_size_obj = NULL;
int map_size; int map_size;
int fd, flags = MAP_SHARED, prot = PROT_WRITE | PROT_READ; int fd, flags = MAP_SHARED, prot = PROT_WRITE | PROT_READ;
char * filename;
int namelen;
char *keywords[] = {"file", "size", "flags", "prot", NULL}; char *keywords[] = {"file", "size", "flags", "prot", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwdict, if (!PyArg_ParseTupleAndKeywords(args, kwdict,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment