summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-03-08 16:32:41 -0700
committerGitHub <noreply@github.com>2018-03-08 16:32:41 -0700
commit876c8525acddd1852238acd432616167d3d14560 (patch)
treefffdbc33d3bc2d2da3d1224701b8344a7ea49c6f
parent96684909b41c240a5ad8039393720d8bd9fc5ece (diff)
parent27b8e54598a325b53fc73b2017ef5e2272f3e5f4 (diff)
downloadpython-numpy-876c8525acddd1852238acd432616167d3d14560.tar.gz
python-numpy-876c8525acddd1852238acd432616167d3d14560.tar.bz2
python-numpy-876c8525acddd1852238acd432616167d3d14560.zip
Merge pull request #10711 from charris/fix-hard-tabs
MAINT: Hard tab and whitespace cleanup.
-rw-r--r--numpy/core/include/numpy/npy_common.h12
-rw-r--r--numpy/core/src/multiarray/alloc.c2
-rw-r--r--numpy/core/src/multiarray/compiled_base.c34
-rw-r--r--numpy/core/src/npymath/ieee754.c.src24
-rw-r--r--numpy/distutils/mingw/gfortran_vs2003_hack.c2
-rw-r--r--numpy/f2py/src/fortranobject.c85
-rw-r--r--numpy/f2py/src/fortranobject.h26
-rw-r--r--numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c26
-rw-r--r--numpy/f2py/tests/test_semicolon_split.py12
-rw-r--r--numpy/linalg/lapack_litemodule.c16
-rw-r--r--numpy/linalg/umath_linalg.c.src2
11 files changed, 121 insertions, 120 deletions
diff --git a/numpy/core/include/numpy/npy_common.h b/numpy/core/include/numpy/npy_common.h
index a1a30f7f0..b7634a930 100644
--- a/numpy/core/include/numpy/npy_common.h
+++ b/numpy/core/include/numpy/npy_common.h
@@ -120,13 +120,13 @@
#if defined(_MSC_VER)
#define NPY_INLINE __inline
#elif defined(__GNUC__)
- #if defined(__STRICT_ANSI__)
- #define NPY_INLINE __inline__
- #else
- #define NPY_INLINE inline
- #endif
+ #if defined(__STRICT_ANSI__)
+ #define NPY_INLINE __inline__
+ #else
+ #define NPY_INLINE inline
+ #endif
#else
- #define NPY_INLINE
+ #define NPY_INLINE
#endif
#ifdef HAVE___THREAD
diff --git a/numpy/core/src/multiarray/alloc.c b/numpy/core/src/multiarray/alloc.c
index f8305d115..ae4b81cf5 100644
--- a/numpy/core/src/multiarray/alloc.c
+++ b/numpy/core/src/multiarray/alloc.c
@@ -263,7 +263,7 @@ PyDataMem_RENEW(void *ptr, size_t size)
result = realloc(ptr, size);
if (result != ptr) {
- PyTraceMalloc_Untrack(NPY_TRACE_DOMAIN, (npy_uintp)ptr);
+ PyTraceMalloc_Untrack(NPY_TRACE_DOMAIN, (npy_uintp)ptr);
}
PyTraceMalloc_Track(NPY_TRACE_DOMAIN, (npy_uintp)result, size);
if (_PyDataMem_eventhook != NULL) {
diff --git a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarray/compiled_base.c
index 12b51156e..56bd65eed 100644
--- a/numpy/core/src/multiarray/compiled_base.c
+++ b/numpy/core/src/multiarray/compiled_base.c
@@ -692,8 +692,8 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
npy_intp i, lenx, lenxp;
const npy_double *dx, *dz;
- const npy_cdouble *dy;
- npy_cdouble lval, rval;
+ const npy_cdouble *dy;
+ npy_cdouble lval, rval;
npy_cdouble *dres, *slopes = NULL;
static char *kwlist[] = {"x", "xp", "fp", "left", "right", NULL};
@@ -740,7 +740,7 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
if (af == NULL) {
goto fail;
}
-
+
dy = (const npy_cdouble *)PyArray_DATA(afp);
dres = (npy_cdouble *)PyArray_DATA(af);
/* Get left and right fill values. */
@@ -757,7 +757,7 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
goto fail;
}
}
-
+
if ((right == NULL) || (right == Py_None)) {
rval = dy[lenxp - 1];
}
@@ -771,12 +771,12 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
goto fail;
}
}
-
+
/* binary_search_with_guess needs at least a 3 item long array */
if (lenxp == 1) {
const npy_double xp_val = dx[0];
const npy_cdouble fp_val = dy[0];
-
+
NPY_BEGIN_THREADS_THRESHOLDED(lenx);
for (i = 0; i < lenx; ++i) {
const npy_double x_val = dz[i];
@@ -787,7 +787,7 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
}
else {
npy_intp j = 0;
-
+
/* only pre-calculate slopes if there are relatively few of them. */
if (lenxp <= lenx) {
slopes = PyArray_malloc((lenxp - 1) * sizeof(npy_cdouble));
@@ -795,9 +795,9 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
goto fail;
}
}
-
+
NPY_BEGIN_THREADS;
-
+
if (slopes != NULL) {
for (i = 0; i < lenxp - 1; ++i) {
const double inv_dx = 1.0 / (dx[i+1] - dx[i]);
@@ -805,16 +805,16 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
slopes[i].imag = (dy[i+1].imag - dy[i].imag) * inv_dx;
}
}
-
+
for (i = 0; i < lenx; ++i) {
const npy_double x_val = dz[i];
-
+
if (npy_isnan(x_val)) {
dres[i].real = x_val;
dres[i].imag = 0.0;
continue;
}
-
+
j = binary_search_with_guess(x_val, dx, lenxp, j);
if (j == -1) {
dres[i] = lval;
@@ -833,17 +833,17 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
else {
const npy_double inv_dx = 1.0 / (dx[j+1] - dx[j]);
dres[i].real = (dy[j+1].real - dy[j].real)*(x_val - dx[j])*
- inv_dx + dy[j].real;
+ inv_dx + dy[j].real;
dres[i].imag = (dy[j+1].imag - dy[j].imag)*(x_val - dx[j])*
- inv_dx + dy[j].imag;
+ inv_dx + dy[j].imag;
}
}
}
-
+
NPY_END_THREADS;
- }
+ }
PyArray_free(slopes);
-
+
Py_DECREF(afp);
Py_DECREF(axp);
Py_DECREF(ax);
diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src
index 0370ea6c7..bca690b4d 100644
--- a/numpy/core/src/npymath/ieee754.c.src
+++ b/numpy/core/src/npymath/ieee754.c.src
@@ -161,22 +161,22 @@ typedef union
/* Get two 64 bit ints from a long double. */
-#define GET_LDOUBLE_WORDS64(ix0,ix1,d) \
-do { \
- ieee854_long_double_shape_type qw_u; \
- qw_u.value = (d); \
- (ix0) = qw_u.parts64.msw; \
- (ix1) = qw_u.parts64.lsw; \
+#define GET_LDOUBLE_WORDS64(ix0,ix1,d) \
+do { \
+ ieee854_long_double_shape_type qw_u; \
+ qw_u.value = (d); \
+ (ix0) = qw_u.parts64.msw; \
+ (ix1) = qw_u.parts64.lsw; \
} while (0)
/* Set a long double from two 64 bit ints. */
-#define SET_LDOUBLE_WORDS64(d,ix0,ix1) \
-do { \
- ieee854_long_double_shape_type qw_u; \
- qw_u.parts64.msw = (ix0); \
- qw_u.parts64.lsw = (ix1); \
- (d) = qw_u.value; \
+#define SET_LDOUBLE_WORDS64(d,ix0,ix1) \
+do { \
+ ieee854_long_double_shape_type qw_u; \
+ qw_u.parts64.msw = (ix0); \
+ qw_u.parts64.lsw = (ix1); \
+ (d) = qw_u.value; \
} while (0)
static npy_longdouble _nextl(npy_longdouble x, int p)
diff --git a/numpy/distutils/mingw/gfortran_vs2003_hack.c b/numpy/distutils/mingw/gfortran_vs2003_hack.c
index 15ed7e686..485a675d8 100644
--- a/numpy/distutils/mingw/gfortran_vs2003_hack.c
+++ b/numpy/distutils/mingw/gfortran_vs2003_hack.c
@@ -1,6 +1,6 @@
int _get_output_format(void)
{
- return 0;
+ return 0;
}
int _imp____lc_codepage = 0;
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c
index a47733433..dd2484eb4 100644
--- a/numpy/f2py/src/fortranobject.c
+++ b/numpy/f2py/src/fortranobject.c
@@ -241,7 +241,7 @@ fortran_doc(FortranDataDef def)
static FortranDataDef *save_def; /* save pointer of an allocatable array */
static void set_data(char *d,npy_intp *f) { /* callback from Fortran */
- if (*f) /* In fortran f=allocated(d) */
+ if (*f) /* In fortran f=allocated(d) */
save_def->data = d;
else
save_def->data = NULL;
@@ -439,23 +439,23 @@ PyTypeObject PyFortran_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
#else
PyObject_HEAD_INIT(0)
- 0, /*ob_size*/
+ 0, /*ob_size*/
#endif
"fortran", /*tp_name*/
sizeof(PyFortranObject), /*tp_basicsize*/
- 0, /*tp_itemsize*/
+ 0, /*tp_itemsize*/
/* methods */
- (destructor)fortran_dealloc, /*tp_dealloc*/
- 0, /*tp_print*/
+ (destructor)fortran_dealloc, /*tp_dealloc*/
+ 0, /*tp_print*/
(getattrfunc)fortran_getattr, /*tp_getattr*/
(setattrfunc)fortran_setattr, /*tp_setattr*/
- 0, /*tp_compare/tp_reserved*/
- (reprfunc)fortran_repr, /*tp_repr*/
- 0, /*tp_as_number*/
- 0, /*tp_as_sequence*/
- 0, /*tp_as_mapping*/
- 0, /*tp_hash*/
- (ternaryfunc)fortran_call, /*tp_call*/
+ 0, /*tp_compare/tp_reserved*/
+ (reprfunc)fortran_repr, /*tp_repr*/
+ 0, /*tp_as_number*/
+ 0, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash*/
+ (ternaryfunc)fortran_call, /*tp_call*/
};
/************************* f2py_report_atexit *******************************/
@@ -656,17 +656,18 @@ PyArrayObject* array_from_pyobj(const int type_num,
const int rank,
const int intent,
PyObject *obj) {
- /* Note about reference counting
- -----------------------------
- If the caller returns the array to Python, it must be done with
- Py_BuildValue("N",arr).
- Otherwise, if obj!=arr then the caller must call Py_DECREF(arr).
-
- Note on intent(cache,out,..)
- ---------------------
- Don't expect correct data when returning intent(cache) array.
-
- */
+ /*
+ * Note about reference counting
+ * -----------------------------
+ * If the caller returns the array to Python, it must be done with
+ * Py_BuildValue("N",arr).
+ * Otherwise, if obj!=arr then the caller must call Py_DECREF(arr).
+ *
+ * Note on intent(cache,out,..)
+ * ---------------------
+ * Don't expect correct data when returning intent(cache) array.
+ *
+ */
char mess[200];
PyArrayObject *arr = NULL;
PyArray_Descr *descr;
@@ -744,17 +745,17 @@ PyArrayObject* array_from_pyobj(const int type_num,
if (check_and_fix_dimensions(arr, rank, dims)) {
return NULL;
}
- /*
- printf("intent alignment=%d\n", F2PY_GET_ALIGNMENT(intent));
- printf("alignment check=%d\n", F2PY_CHECK_ALIGNMENT(arr, intent));
- int i;
- for (i=1;i<=16;i++)
- printf("i=%d isaligned=%d\n", i, ARRAY_ISALIGNED(arr, i));
- */
+ /*
+ printf("intent alignment=%d\n", F2PY_GET_ALIGNMENT(intent));
+ printf("alignment check=%d\n", F2PY_CHECK_ALIGNMENT(arr, intent));
+ int i;
+ for (i=1;i<=16;i++)
+ printf("i=%d isaligned=%d\n", i, ARRAY_ISALIGNED(arr, i));
+ */
if ((! (intent & F2PY_INTENT_COPY))
&& PyArray_ITEMSIZE(arr)==elsize
&& ARRAY_ISCOMPATIBLE(arr,type_num)
- && F2PY_CHECK_ALIGNMENT(arr, intent)
+ && F2PY_CHECK_ALIGNMENT(arr, intent)
) {
if ((intent & F2PY_INTENT_C)?PyArray_ISCARRAY(arr):PyArray_ISFARRAY(arr)) {
if ((intent & F2PY_INTENT_OUT)) {
@@ -780,8 +781,8 @@ PyArrayObject* array_from_pyobj(const int type_num,
if (!(ARRAY_ISCOMPATIBLE(arr,type_num)))
sprintf(mess+strlen(mess)," -- input '%c' not compatible to '%c'",
PyArray_DESCR(arr)->type,typechar);
- if (!(F2PY_CHECK_ALIGNMENT(arr, intent)))
- sprintf(mess+strlen(mess)," -- input not %d-aligned", F2PY_GET_ALIGNMENT(intent));
+ if (!(F2PY_CHECK_ALIGNMENT(arr, intent)))
+ sprintf(mess+strlen(mess)," -- input not %d-aligned", F2PY_GET_ALIGNMENT(intent));
PyErr_SetString(PyExc_ValueError,mess);
return NULL;
}
@@ -858,14 +859,14 @@ static
int check_and_fix_dimensions(const PyArrayObject* arr, const int rank, npy_intp *dims)
{
/*
- This function fills in blanks (that are -1's) in dims list using
- the dimensions from arr. It also checks that non-blank dims will
- match with the corresponding values in arr dimensions.
-
- Returns 0 if the function is successful.
-
- If an error condition is detected, an exception is set and 1 is returned.
- */
+ * This function fills in blanks (that are -1's) in dims list using
+ * the dimensions from arr. It also checks that non-blank dims will
+ * match with the corresponding values in arr dimensions.
+ *
+ * Returns 0 if the function is successful.
+ *
+ * If an error condition is detected, an exception is set and 1 is returned.
+ */
const npy_intp arr_size = (PyArray_NDIM(arr))?PyArray_Size((PyObject *)arr):1;
#ifdef DEBUG_COPY_ND_ARRAY
dump_attrs(arr);
@@ -922,7 +923,7 @@ int check_and_fix_dimensions(const PyArrayObject* arr, const int rank, npy_intp
int i;
npy_intp d;
for (i=0; i<rank; ++i) {
- d = PyArray_DIM(arr,i);
+ d = PyArray_DIM(arr,i);
if (dims[i]>=0) {
if (d > 1 && d!=dims[i]) {
PyErr_Format(PyExc_ValueError,
diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h
index c9b54e259..5d0dcf676 100644
--- a/numpy/f2py/src/fortranobject.h
+++ b/numpy/f2py/src/fortranobject.h
@@ -78,16 +78,16 @@ typedef void *(*f2pycfunc)(void);
typedef struct {
char *name; /* attribute (array||routine) name */
int rank; /* array rank, 0 for scalar, max is F2PY_MAX_DIMS,
- || rank=-1 for Fortran routine */
+ || rank=-1 for Fortran routine */
struct {npy_intp d[F2PY_MAX_DIMS];} dims; /* dimensions of the array, || not used */
int type; /* PyArray_<type> || not used */
char *data; /* pointer to array || Fortran routine */
- f2py_init_func func; /* initialization function for
- allocatable arrays:
- func(&rank,dims,set_ptr_func,name,len(name))
- || C/API wrapper for Fortran routine */
+ f2py_init_func func; /* initialization function for
+ allocatable arrays:
+ func(&rank,dims,set_ptr_func,name,len(name))
+ || C/API wrapper for Fortran routine */
char *doc; /* documentation string; only recommended
- for routines. */
+ for routines. */
} FortranDataDef;
typedef struct {
@@ -139,16 +139,16 @@ int F2PyCapsule_Check(PyObject *ptr);
#define F2PY_ALIGN16(intent) (intent & F2PY_INTENT_ALIGNED16)
#define F2PY_GET_ALIGNMENT(intent) \
- (F2PY_ALIGN4(intent) ? 4 : \
- (F2PY_ALIGN8(intent) ? 8 : \
- (F2PY_ALIGN16(intent) ? 16 : 1) ))
+ (F2PY_ALIGN4(intent) ? 4 : \
+ (F2PY_ALIGN8(intent) ? 8 : \
+ (F2PY_ALIGN16(intent) ? 16 : 1) ))
#define F2PY_CHECK_ALIGNMENT(arr, intent) ARRAY_ISALIGNED(arr, F2PY_GET_ALIGNMENT(intent))
extern PyArrayObject* array_from_pyobj(const int type_num,
- npy_intp *dims,
- const int rank,
- const int intent,
- PyObject *obj);
+ npy_intp *dims,
+ const int rank,
+ const int intent,
+ PyObject *obj);
extern int copy_ND_array(const PyArrayObject *in, PyArrayObject *out);
#ifdef DEBUG_COPY_ND_ARRAY
diff --git a/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c b/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
index 22801abdc..7f46303b0 100644
--- a/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
+++ b/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
@@ -33,7 +33,7 @@ Required arguments:\n"
"Return objects:\n"
" arr : array";
static PyObject *f2py_rout_wrap_call(PyObject *capi_self,
- PyObject *capi_args) {
+ PyObject *capi_args) {
PyObject * volatile capi_buildvalue = NULL;
int type_num = 0;
npy_intp *dims = NULL;
@@ -45,7 +45,7 @@ static PyObject *f2py_rout_wrap_call(PyObject *capi_self,
int i;
if (!PyArg_ParseTuple(capi_args,"iOiO|:wrap.call",\
- &type_num,&dims_capi,&intent,&arr_capi))
+ &type_num,&dims_capi,&intent,&arr_capi))
return NULL;
rank = PySequence_Length(dims_capi);
dims = malloc(rank*sizeof(npy_intp));
@@ -78,7 +78,7 @@ Required arguments:\n"
" itemsize : int\n"
;
static PyObject *f2py_rout_wrap_attrs(PyObject *capi_self,
- PyObject *capi_args) {
+ PyObject *capi_args) {
PyObject *arr_capi = Py_None;
PyArrayObject *arr = NULL;
PyObject *dimensions = NULL;
@@ -87,7 +87,7 @@ static PyObject *f2py_rout_wrap_attrs(PyObject *capi_self,
int i;
memset(s,0,100*sizeof(char));
if (!PyArg_ParseTuple(capi_args,"O!|:wrap.attrs",
- &PyArray_Type,&arr_capi))
+ &PyArray_Type,&arr_capi))
return NULL;
arr = (PyArrayObject *)arr_capi;
sprintf(s,"%p",PyArray_DATA(arr));
@@ -98,15 +98,15 @@ static PyObject *f2py_rout_wrap_attrs(PyObject *capi_self,
PyTuple_SetItem(strides,i,PyInt_FromLong(PyArray_STRIDE(arr,i)));
}
return Py_BuildValue("siOOO(cciii)ii",s,PyArray_NDIM(arr),
- dimensions,strides,
- (PyArray_BASE(arr)==NULL?Py_None:PyArray_BASE(arr)),
- PyArray_DESCR(arr)->kind,
- PyArray_DESCR(arr)->type,
- PyArray_TYPE(arr),
- PyArray_ITEMSIZE(arr),
- PyArray_DESCR(arr)->alignment,
- PyArray_FLAGS(arr),
- PyArray_ITEMSIZE(arr));
+ dimensions,strides,
+ (PyArray_BASE(arr)==NULL?Py_None:PyArray_BASE(arr)),
+ PyArray_DESCR(arr)->kind,
+ PyArray_DESCR(arr)->type,
+ PyArray_TYPE(arr),
+ PyArray_ITEMSIZE(arr),
+ PyArray_DESCR(arr)->alignment,
+ PyArray_FLAGS(arr),
+ PyArray_ITEMSIZE(arr));
}
static PyMethodDef f2py_module_methods[] = {
diff --git a/numpy/f2py/tests/test_semicolon_split.py b/numpy/f2py/tests/test_semicolon_split.py
index d844e2eae..2b0f32727 100644
--- a/numpy/f2py/tests/test_semicolon_split.py
+++ b/numpy/f2py/tests/test_semicolon_split.py
@@ -9,14 +9,14 @@ class TestMultiline(util.F2PyTest):
code = """
python module {module}
usercode '''
-void foo(int* x) {{
+void foo(int* x) {{
char dummy = ';';
- *x = 42;
+ *x = 42;
}}
'''
interface
subroutine foo(x)
- intent(c) foo
+ intent(c) foo
integer intent(out) :: x
end subroutine foo
end interface
@@ -37,11 +37,11 @@ void foo(int* x) {{
'''
interface
subroutine foo(x)
- intent(c) foo
+ intent(c) foo
integer intent(out) :: x
- callprotoargument int*
+ callprotoargument int*
callstatement {{ &
- ; &
+ ; &
x = 42; &
}}
end subroutine foo
diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c
index f321d6a6f..bdde2e22d 100644
--- a/numpy/linalg/lapack_litemodule.c
+++ b/numpy/linalg/lapack_litemodule.c
@@ -153,9 +153,9 @@ lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args)
lapack_lite_status =
FNAME(dgeqrf)(&m, &n, DDATA(a), &lda, DDATA(tau),
DDATA(work), &lwork, &info);
- if (PyErr_Occurred()) {
+ if (PyErr_Occurred()) {
return NULL;
- }
+ }
return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","dgeqrf_",
lapack_lite_status,"m",m,"n",n,"lda",lda,
@@ -179,9 +179,9 @@ lapack_lite_dorgqr(PyObject *NPY_UNUSED(self), PyObject *args)
lapack_lite_status =
FNAME(dorgqr)(&m, &n, &k, DDATA(a), &lda, DDATA(tau), DDATA(work),
&lwork, &info);
- if (PyErr_Occurred()) {
+ if (PyErr_Occurred()) {
return NULL;
- }
+ }
return Py_BuildValue("{s:i,s:i}","dorgqr_",lapack_lite_status,
"info",info);
@@ -249,9 +249,9 @@ lapack_lite_zgeqrf(PyObject *NPY_UNUSED(self), PyObject *args)
lapack_lite_status =
FNAME(zgeqrf)(&m, &n, ZDATA(a), &lda, ZDATA(tau), ZDATA(work),
&lwork, &info);
- if (PyErr_Occurred()) {
+ if (PyErr_Occurred()) {
return NULL;
- }
+ }
return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","zgeqrf_",lapack_lite_status,"m",m,"n",n,"lda",lda,"lwork",lwork,"info",info);
}
@@ -275,9 +275,9 @@ lapack_lite_zungqr(PyObject *NPY_UNUSED(self), PyObject *args)
lapack_lite_status =
FNAME(zungqr)(&m, &n, &k, ZDATA(a), &lda, ZDATA(tau), ZDATA(work),
&lwork, &info);
- if (PyErr_Occurred()) {
+ if (PyErr_Occurred()) {
return NULL;
- }
+ }
return Py_BuildValue("{s:i,s:i}","zungqr_",lapack_lite_status,
"info",info);
diff --git a/numpy/linalg/umath_linalg.c.src b/numpy/linalg/umath_linalg.c.src
index 3c30982a7..0248518ac 100644
--- a/numpy/linalg/umath_linalg.c.src
+++ b/numpy/linalg/umath_linalg.c.src
@@ -1373,7 +1373,7 @@ init_@lapack_func@(EIGH_PARAMS_t *params,
fortran_int lda = fortran_int_max(N, 1);
mem_buff = malloc(safe_N * safe_N * sizeof(@typ@) +
- safe_N * sizeof(@basetyp@));
+ safe_N * sizeof(@basetyp@));
if (!mem_buff) {
goto error;
}