MAINt: Rename variables and at least only duplicate cleanup

Author: seberg

numpy/_core/src/multiarray/multiarraymodule.c

@@ -1957,14 +1957,14 @@ array_copyto(PyObject *NPY_UNUSED(ignored),
     if (src == NULL) {
         goto fail;
     }
-    PyArray_DTypeMeta *dtype = NPY_DTYPE(PyArray_DESCR(src));
-    Py_INCREF(dtype);
-    if (npy_mark_tmp_array_if_pyscalar(src_obj, src, &dtype)) {
+    PyArray_DTypeMeta *DType = NPY_DTYPE(PyArray_DESCR(src));
+    Py_INCREF(DType);
+    if (npy_mark_tmp_array_if_pyscalar(src_obj, src, &DType)) {
         /* The user passed a Python scalar */
         PyArray_Descr *descr = npy_find_descr_for_scalar(
-                src_obj, PyArray_DESCR(src), dtype,
+                src_obj, PyArray_DESCR(src), DType,
                 NPY_DTYPE(PyArray_DESCR(dst)));
-        Py_DECREF(dtype);
+        Py_DECREF(DType);
         if (descr == NULL) {
             goto fail;
         }
@@ -1975,17 +1975,17 @@ array_copyto(PyObject *NPY_UNUSED(ignored),
         }
     }
     else {
-        Py_DECREF(dtype);
+        Py_DECREF(DType);
     }
 
     if (wheremask_in != NULL) {
         /* Get the boolean where mask */
-        PyArray_Descr *dtype = PyArray_DescrFromType(NPY_BOOL);
-        if (dtype == NULL) {
+        PyArray_Descr *descr = PyArray_DescrFromType(NPY_BOOL);
+        if (descr == NULL) {
             goto fail;
         }
         wheremask = (PyArrayObject *)PyArray_FromAny(wheremask_in,
-                                        dtype, 0, 0, 0, NULL);
+                                        descr, 0, 0, 0, NULL);
         if (wheremask == NULL) {
             goto fail;
         }

numpy/_core/src/umath/ufunc_object.c

@@ -2356,7 +2356,7 @@ reducelike_promote_and_resolve(PyUFuncObject *ufunc,
     if (evil_ndim_mutating_hack) {
         ((PyArrayObject_fields *)out)->nd = 0;
     }
-    // TODO: Clean up multiple cleanup!
+
     if (ufuncimpl == NULL) {
         /* DTypes may currently get filled in fallbacks and XDECREF for error: */
         Py_XDECREF(operation_DTypes[0]);
@@ -2372,18 +2372,15 @@ reducelike_promote_and_resolve(PyUFuncObject *ufunc,
      * casting safety could in principle be set to the default same-kind.
      * (although this should possibly happen through a deprecation)
      */
-    if (resolve_descriptors(3, ufunc, ufuncimpl,
-            ops, out_descrs, signature, operation_DTypes, NULL, casting) < 0) {
-        /* DTypes may currently get filled in fallbacks and XDECREF for error: */
-        Py_XDECREF(operation_DTypes[0]);
-        Py_XDECREF(operation_DTypes[1]);
-        Py_XDECREF(operation_DTypes[2]);
-        return NULL;
-    }
-    /* DTypes may currently get filled in fallbacks and XDECREF for error: */
+    int res = resolve_descriptors(3, ufunc, ufuncimpl,
+            ops, out_descrs, signature, operation_DTypes, NULL, casting);
+
     Py_XDECREF(operation_DTypes[0]);
     Py_XDECREF(operation_DTypes[1]);
     Py_XDECREF(operation_DTypes[2]);
+    if (res < 0) {
+        return NULL;
+    }
 
     /*
      * The first operand and output should be the same array, so they should