STY: better brace usage

Author: qwhelan

bottleneck/src/nonreduce_axis_template.c

@@ -56,7 +56,9 @@ NRA(partition, DTYPE0) {
     a = (PyArrayObject *)PyArray_NewCopy(a, NPY_ANYORDER);
     init_iter_one(&it, a, axis);
 
-    if (LENGTH == 0) return (PyObject *)a;
+    if (LENGTH == 0) {
+        return (PyObject *)a;
+    }
     if (n < 0 || n > LENGTH - 1) {
         PyErr_Format(PyExc_ValueError,
                      "`n` (=%d) must be between 0 and %zd, inclusive.",
@@ -106,8 +108,10 @@ NRA_MAIN(partition, PARSE_PARTITION)
             j--;                           \
         }                                  \
     } while (m <= j);                      \
-    if (j < k) l = m;                      \
-    if (k < m) r = j;
+    if (j < k)                             \
+        l = m;                             \
+    if (k < m)                             \
+        r = j;
 
 #define ARGPARTITION(dtype0, dtype1)               \
     while (l < r) {                                \
@@ -168,7 +172,9 @@ NRA(argpartition, DTYPE0) {
     PyObject *y = PyArray_EMPTY(PyArray_NDIM(a), PyArray_SHAPE(a), NPY_DTYPE1, 0);
     iter2     it;
     init_iter2(&it, a, y, axis);
-    if (LENGTH == 0) return y;
+    if (LENGTH == 0) {
+        return y;
+    }
     if (n < 0 || n > LENGTH - 1) {
         PyErr_Format(PyExc_ValueError,
                      "`n` (=%d) must be between 0 and %zd, inclusive.",

bottleneck/src/nonreduce_template.c

@@ -242,36 +242,34 @@ nonreducer(char *    name,
     if (old_obj == NULL) {
         RUNTIME_ERR("`old_obj` should never be NULL; please report this bug.");
         goto error;
-    } else {
-        old = PyFloat_AsDouble(old_obj);
-        if (error_converting(old)) {
-            TYPE_ERR("`old` must be a number");
-            goto error;
-        }
+    }
+    const double old_value = PyFloat_AsDouble(old_obj);
+    if (error_converting(old_value)) {
+        TYPE_ERR("`old` must be a number");
+        goto error;
     }
 
     /* new */
     if (new_obj == NULL) {
         RUNTIME_ERR("`new_obj` should never be NULL; please report this bug.");
         goto error;
-    } else {
-        new = PyFloat_AsDouble(new_obj);
-        if (error_converting(new)) {
-            TYPE_ERR("`new` must be a number");
-            goto error;
-        }
+    }
+    const double new_value = PyFloat_AsDouble(new_obj);
+    if (error_converting(new_value)) {
+        TYPE_ERR("`new` must be a number");
+        goto error;
     }
 
-    dtype = PyArray_TYPE(a);
+    const int dtype = PyArray_TYPE(a);
 
     if (dtype == NPY_float64) {
-        y = nr_float64(a, old, new);
+        y = nr_float64(a, old_value, new_value);
     } else if (dtype == NPY_float32) {
-        y = nr_float32(a, old, new);
+        y = nr_float32(a, old_value, new_value);
     } else if (dtype == NPY_int64) {
-        y = nr_int64(a, old, new);
+        y = nr_int64(a, old_value, new_value);
     } else if (dtype == NPY_int32) {
-        y = nr_int32(a, old, new);
+        y = nr_int32(a, old_value, new_value);
     } else {
         y = slow(name, args, kwds);
     }
@@ -372,7 +370,9 @@ initnonreduce(void)
 #else
     PyObject *m = Py_InitModule3("nonreduce", nonreduce_methods, nonreduce_doc);
 #endif
-    if (m == NULL) return RETVAL;
+    if (m == NULL) {
+        return RETVAL;
+    }
     import_array();
     if (!intern_strings()) {
         return RETVAL;