From 09d2c51fa1d09b17060a8545b925f4dded9dedb1 Mon Sep 17 00:00:00 2001 From: Ondrej Certik Date: Fri, 3 Aug 2012 09:36:46 -0700 Subject: Follow the C guidelines --- numpy/core/src/multiarray/scalarapi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c index 0afdc1700..97a5e4be4 100644 --- a/numpy/core/src/multiarray/scalarapi.c +++ b/numpy/core/src/multiarray/scalarapi.c @@ -645,6 +645,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) if (type_num == NPY_UNICODE) { PyObject *u, *args; char *buffer; + if (swap) { buffer = malloc(itemsize); if (buffer == NULL) { @@ -653,7 +654,8 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) } memcpy(buffer, data, itemsize); byte_swap_vector(buffer, itemsize >> 2, 4); - } else { + } + else { buffer = data; } u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer, @@ -778,7 +780,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) #endif return obj; } -#endif // PY_VERSION_HEX < 0x03030000 +#endif /* PY_VERSION_HEX < 0x03030000 */ else { PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj; vobj->base = NULL; -- cgit v1.2.1