mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Removed pointless parens around return expressions;

Browse source 
deleted some curlies around one-line blocks.
This commit is contained in:
Tim Peters 2006-02-16 23:50:16 +00:00
parent ec0a5f0add
commit 23721ee96c
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Modules/mmapmodule.c
View file

@ -152,7 +152,7 @@ mmap_close_method(mmap_object *self, PyObject *args)
#endif #endif
Py_INCREF (Py_None); Py_INCREF (Py_None);
return (Py_None); return Py_None;
} }
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
@ -213,7 +213,7 @@ mmap_read_line_method(mmap_object *self,
newline. */ newline. */
result = PyString_FromStringAndSize(start, (eol - start)); result = PyString_FromStringAndSize(start, (eol - start));
self->pos += (eol - start); self->pos += (eol - start);
return (result); return result;
} }
static PyObject * static PyObject *
@ -233,7 +233,7 @@ mmap_read_method(mmap_object *self,
} }
result = Py_BuildValue("s#", self->data+self->pos, num_bytes); result = Py_BuildValue("s#", self->data+self->pos, num_bytes);
self->pos += num_bytes; self->pos += num_bytes;
return (result); return result;
} }
static PyObject * static PyObject *
@ -313,7 +313,7 @@ mmap_write_method(mmap_object *self,
memcpy (self->data+self->pos, data, length); memcpy (self->data+self->pos, data, length);
self->pos = self->pos+length; self->pos = self->pos+length;
Py_INCREF (Py_None); Py_INCREF (Py_None);
return (Py_None); return Py_None;
} }
static PyObject * static PyObject *
@ -331,7 +331,7 @@ mmap_write_byte_method(mmap_object *self,
*(self->data+self->pos) = value; *(self->data+self->pos) = value;
self->pos += 1; self->pos += 1;
Py_INCREF (Py_None); Py_INCREF (Py_None);
return (Py_None); return Py_None;
} }
static PyObject * static PyObject *
@ -344,11 +344,11 @@ mmap_size_method(mmap_object *self,
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
if (self->file_handle != INVALID_HANDLE_VALUE) { if (self->file_handle != INVALID_HANDLE_VALUE) {
return (Py_BuildValue ( return Py_BuildValue (
"l", (long) "l", (long)
GetFileSize (self->file_handle, NULL))); GetFileSize (self->file_handle, NULL));
} else { } else {
return (Py_BuildValue ("l", (long) self->size) ); return Py_BuildValue ("l", (long) self->size);
} }
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
@ -359,7 +359,7 @@ mmap_size_method(mmap_object *self,
PyErr_SetFromErrno(mmap_module_error); PyErr_SetFromErrno(mmap_module_error);
return NULL; return NULL;
} }
return (Py_BuildValue ("l", (long) buf.st_size) ); return Py_BuildValue ("l", (long) buf.st_size);
} }
#endif /* UNIX */ #endif /* UNIX */
} }
@ -419,7 +419,7 @@ mmap_resize_method(mmap_object *self,
dwErrCode = GetLastError(); dwErrCode = GetLastError();
} }
PyErr_SetFromWindowsErr(dwErrCode); PyErr_SetFromWindowsErr(dwErrCode);
return (NULL); return NULL;
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
#ifdef UNIX #ifdef UNIX
@ -462,7 +462,7 @@ mmap_tell_method(mmap_object *self, PyObject *args)
CHECK_VALID(NULL); CHECK_VALID(NULL);
if (!PyArg_ParseTuple(args, ":tell")) if (!PyArg_ParseTuple(args, ":tell"))
return NULL; return NULL;
return (Py_BuildValue ("l", (long) self->pos) ); return Py_BuildValue ("l", (long) self->pos);
} }
static PyObject * static PyObject *
@ -479,8 +479,8 @@ mmap_flush_method(mmap_object *self, PyObject *args)
return NULL; return NULL;
} else { } else {
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
return (Py_BuildValue("l", (long) return Py_BuildValue("l", (long)
FlushViewOfFile(self->data+offset, size))); FlushViewOfFile(self->data+offset, size));
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
#ifdef UNIX #ifdef UNIX
/* XXX semantics of return value? */ /* XXX semantics of return value? */
@ -531,7 +531,7 @@ mmap_seek_method(mmap_object *self, PyObject *args)
goto onoutofrange; goto onoutofrange;
self->pos = where; self->pos = where;
Py_INCREF (Py_None); Py_INCREF (Py_None);
return (Py_None); return Py_None;
} }
onoutofrange: onoutofrange:
@ -1115,17 +1115,15 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
0, 0,
0, 0,
0); 0);
if (m_obj->data != NULL) { if (m_obj->data != NULL)
return ((PyObject *) m_obj); return (PyObject *)m_obj;
} else { else
dwErr = GetLastError(); dwErr = GetLastError();
} } else
} else {
dwErr = GetLastError(); dwErr = GetLastError();
}
Py_DECREF(m_obj); Py_DECREF(m_obj);
PyErr_SetFromWindowsErr(dwErr); PyErr_SetFromWindowsErr(dwErr);
return (NULL); return NULL;
} }
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */