Remove some shadowed variables

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 6e070a9099b86e75a28b3b7f53fa533b3e4c3fb8..8a5166ebf87e60ee16ed37314e0ee0dc3b355494 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -415,7 +415,7 @@ binary_op1(PyObject *v, PyObject *w, const int op_slot)
                                binaryfunc slot;
                                slot = NB_BINOP(mv, op_slot);
                                if (slot) {
-                                       PyObject *x = slot(v, w);
+                                       x = slot(v, w);
                                        Py_DECREF(v);
                                        Py_DECREF(w);
                                        return x;

diff --git a/Objects/setobject.c b/Objects/setobject.c
index d39f26587f589080b96ca41c8baebf1e059b0920..2494baeab8f85479c602202036eeb97c492e9173 100644 (file)
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -846,7 +846,7 @@ set_update_internal(PySetObject *so, PyObject *other)
                return set_merge(so, other);
 
        if (PyDict_Check(other)) {
-               PyObject *key, *value;
+               PyObject *value;
                int pos = 0;
                while (PyDict_Next(other, &pos, &key, &value)) {
                        if (set_add_key(so, key) == -1)

diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 1de9434295cac364ed65df150fa942667cb864c5..fd99a63f2330061b9b13edfc96ad419740fafb45 100644 (file)
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -920,8 +920,8 @@ PyObject_ClearWeakRefs(PyObject *object)
                 PyObject *callback = PyTuple_GET_ITEM(tuple, i * 2 + 1);
 
                 if (callback != NULL) {
-                    PyObject *current = PyTuple_GET_ITEM(tuple, i * 2);
-                    handle_callback((PyWeakReference *)current, callback);
+                    PyObject *item = PyTuple_GET_ITEM(tuple, i * 2);
+                    handle_callback((PyWeakReference *)item, callback);
                 }
             }
             Py_DECREF(tuple);