summaryrefslogtreecommitdiff
path: root/numpy/core/src
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2008-07-16 19:46:41 +0000
committerCharles Harris <charlesr.harris@gmail.com>2008-07-16 19:46:41 +0000
commita98f7c8be521ea58a3c9c44729bcd162f01a7f0f (patch)
tree64b92c99ca153192619296089d69a506e65a2a05 /numpy/core/src
parent120252edb36a6dba5f824d73a2ed2624d1cde874 (diff)
downloadnumpy-a98f7c8be521ea58a3c9c44729bcd162f01a7f0f.tar.gz
Coding style cleanup. Replace hard tabs with spaces.
Diffstat (limited to 'numpy/core/src')
-rw-r--r--numpy/core/src/multiarraymodule.c10
-rw-r--r--numpy/core/src/scalartypes.inc.src35
2 files changed, 28 insertions, 17 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c
index b03723e37..74f0c77ac 100644
--- a/numpy/core/src/multiarraymodule.c
+++ b/numpy/core/src/multiarraymodule.c
@@ -2164,12 +2164,12 @@ PyArray_CanCoerceScalar(int thistype, int neededtype,
if (from->f->cancastscalarkindto &&
(castlist = from->f->cancastscalarkindto[scalar])) {
while (*castlist != PyArray_NOTYPE)
- if (*castlist++ == neededtype) {
- Py_DECREF(from);
- return 1;
- }
+ if (*castlist++ == neededtype) {
+ Py_DECREF(from);
+ return 1;
+ }
}
- Py_DECREF(from);
+ Py_DECREF(from);
switch(scalar) {
case PyArray_BOOL_SCALAR:
diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src
index 07c600702..20da334b9 100644
--- a/numpy/core/src/scalartypes.inc.src
+++ b/numpy/core/src/scalartypes.inc.src
@@ -1895,24 +1895,25 @@ object_arrtype_dealloc(PyObject *v)
static PyObject *
@name@_arrtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
- PyObject *obj=NULL;
+ PyObject *obj = NULL;
PyObject *robj;
PyObject *arr;
- PyArray_Descr *typecode=NULL;
+ PyArray_Descr *typecode = NULL;
int itemsize;
void *dest, *src;
_WORK@work@
- if (!PyArg_ParseTuple(args, "|O", &obj)) return NULL;
-
+ if (!PyArg_ParseTuple(args, "|O", &obj)) {
+ return NULL;
+ }
typecode = PyArray_DescrFromType(PyArray_@TYPE@);
- /* typecode is new reference and stolen by
+ /* typecode is new reference and stolen by
PyArray_Scalar and others */
if (obj == NULL) {
#if @default@ == 0
- char *mem;
- mem = malloc(sizeof(@name@));
+ char *mem = malloc(sizeof(@name@));
+
memset(mem, 0, sizeof(@name@));
robj = PyArray_Scalar(mem, typecode, NULL);
free(mem);
@@ -1926,20 +1927,30 @@ static PyObject *
}
arr = PyArray_FromAny(obj, typecode, 0, 0, FORCECAST, NULL);
- if ((arr==NULL) || (PyArray_NDIM(arr) > 0)) return arr;
+ if ((arr == NULL) || (PyArray_NDIM(arr) > 0)) {
+ return arr;
+ }
robj = PyArray_Return((PyArrayObject *)arr);
finish:
- if ((robj==NULL) || (robj->ob_type == type)) return robj;
+ if ((robj == NULL) || (robj->ob_type == type)) {
+ return robj;
+ }
/* Need to allocate new type and copy data-area over */
if (type->tp_itemsize) {
itemsize = PyString_GET_SIZE(robj);
}
- else itemsize = 0;
+ else {
+ itemsize = 0;
+ }
obj = type->tp_alloc(type, itemsize);
- if (obj == NULL) {Py_DECREF(robj); return NULL;}
- if (typecode==NULL)
+ if (obj == NULL) {
+ Py_DECREF(robj);
+ return NULL;
+ }
+ if (typecode == NULL) {
typecode = PyArray_DescrFromType(PyArray_@TYPE@);
+ }
dest = scalar_value(obj, typecode);
src = scalar_value(robj, typecode);
Py_DECREF(typecode);