[Numpy-svn] r5389 - trunk/numpy/core/src
numpy-svn at scipy.org
numpy-svn at scipy.org
Sat Jul 12 01:01:25 EDT 2008
Author: charris
Date: 2008-07-12 00:01:19 -0500 (Sat, 12 Jul 2008)
New Revision: 5389
Modified:
trunk/numpy/core/src/arrayobject.c
Log:
Coding style cleanups.
Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c 2008-07-10 18:26:29 UTC (rev 5388)
+++ trunk/numpy/core/src/arrayobject.c 2008-07-12 05:01:19 UTC (rev 5389)
@@ -9052,9 +9052,10 @@
if (fromtype == PyArray_OBJECT || fromtype == PyArray_VOID) return 0;
from = PyArray_DescrFromType(fromtype);
- /* cancastto is a PyArray_NOTYPE terminated C-int-array of types that
- the data-type can be cast to safely.
- */
+ /*
+ * cancastto is a PyArray_NOTYPE terminated C-int-array of types that
+ * the data-type can be cast to safely.
+ */
if (from->f->cancastto) {
int *curtype;
curtype = from->f->cancastto;
@@ -11083,22 +11084,24 @@
static PyArray_Descr *
PyArray_DescrNew(PyArray_Descr *base)
{
- PyArray_Descr *new;
+ PyArray_Descr *new = PyObject_New(PyArray_Descr, &PyArrayDescr_Type);
- new = PyObject_New(PyArray_Descr, &PyArrayDescr_Type);
- if (new == NULL) return NULL;
+ if (new == NULL) {
+ return NULL;
+ }
/* Don't copy PyObject_HEAD part */
- memcpy((char *)new+sizeof(PyObject),
- (char *)base+sizeof(PyObject),
- sizeof(PyArray_Descr)-sizeof(PyObject));
+ memcpy((char *)new + sizeof(PyObject),
+ (char *)base + sizeof(PyObject),
+ sizeof(PyArray_Descr) - sizeof(PyObject));
- if (new->fields == Py_None) new->fields = NULL;
+ if (new->fields == Py_None) {
+ new->fields = NULL;
+ }
Py_XINCREF(new->fields);
Py_XINCREF(new->names);
if (new->subarray) {
new->subarray = _pya_malloc(sizeof(PyArray_ArrayDescr));
- memcpy(new->subarray, base->subarray,
- sizeof(PyArray_ArrayDescr));
+ memcpy(new->subarray, base->subarray, sizeof(PyArray_ArrayDescr));
Py_INCREF(new->subarray->shape);
Py_INCREF(new->subarray->base);
}
More information about the Numpy-svn
mailing list