diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2008-07-12 05:01:19 +0000 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2008-07-12 05:01:19 +0000 |
commit | 2e578e7218e45692d435890c4b0f52da4ef3f2cf (patch) | |
tree | bc2d1f10fe7f0d2d83fa05956503c8bb99dd3a34 /numpy/core/src/arrayobject.c | |
parent | f2abd6377ba69688713b7c6aef58005b31242f5a (diff) | |
download | numpy-2e578e7218e45692d435890c4b0f52da4ef3f2cf.tar.gz |
Coding style cleanups.
Diffstat (limited to 'numpy/core/src/arrayobject.c')
-rw-r--r-- | numpy/core/src/arrayobject.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index ee4e94552..d3bc4c68c 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -9052,9 +9052,10 @@ PyArray_CanCastSafely(int fromtype, int totype) 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 @@ PyArray_DescrNewFromType(int type_num) 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); } |