Remove some shadowed variables

python · Jan 8, 2006 · 0c6e2f1 · 0c6e2f1
1 parent 76dc081
commit 0c6e2f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);