summaryrefslogtreecommitdiff
path: root/numpy/core/src/arrayobject.c
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2008-06-07 22:43:03 +0000
committerCharles Harris <charlesr.harris@gmail.com>2008-06-07 22:43:03 +0000
commitb8c5c9c07ad436a2c1216bbedb0f8221d3119f6b (patch)
tree494ad94fc752d6e79f10986824185951377c3ddc /numpy/core/src/arrayobject.c
parent942d2dce9638f13b964bdfb9c1d56c25f7455619 (diff)
downloadnumpy-b8c5c9c07ad436a2c1216bbedb0f8221d3119f6b.tar.gz
Fix missing return value, closes ticket #813.
Diffstat (limited to 'numpy/core/src/arrayobject.c')
-rw-r--r--numpy/core/src/arrayobject.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 83dd9e8ad..ee4e94552 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -6645,19 +6645,20 @@ array_base_get(PyArrayObject *self)
static int
_zerofill(PyArrayObject *ret)
{
- intp n;
-
if (PyDataType_REFCHK(ret->descr)) {
PyObject *zero = PyInt_FromLong(0);
PyArray_FillObjectArray(ret, zero);
Py_DECREF(zero);
- if (PyErr_Occurred()) {Py_DECREF(ret); return -1;}
+ if (PyErr_Occurred()) {
+ Py_DECREF(ret);
+ return -1;
+ }
}
else {
- n = PyArray_NBYTES(ret);
+ intp n = PyArray_NBYTES(ret);
memset(ret->data, 0, n);
- return 0;
- }
+ }
+ return 0;
}