summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorOndrej Certik <ondrej.certik@gmail.com>2012-08-03 09:36:46 -0700
committerOndrej Certik <ondrej.certik@gmail.com>2012-08-03 09:36:46 -0700
commit09d2c51fa1d09b17060a8545b925f4dded9dedb1 (patch)
tree8e6eabfb263d303202b0c46e302540fd83072eeb /numpy
parent4234b6b13e3ee9da6fc1c24e9e8c442d77587837 (diff)
downloadnumpy-09d2c51fa1d09b17060a8545b925f4dded9dedb1.tar.gz
Follow the C guidelines
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/multiarray/scalarapi.c6
1 files 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;