diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-01-08 06:13:44 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-01-08 06:13:44 (GMT) |
| commit | 0c6e2f16408efa2f8ca79e9679d5f78857fc66d2 (patch) | |
| tree | b7a73a74e5d4c498e7a8d18a8a9144d543d7d939 | |
| parent | 76dc081dd9130de71893ca2d9bb8156f4c13a4d4 (diff) | |
| download | cpython-0c6e2f16408efa2f8ca79e9679d5f78857fc66d2.zip cpython-0c6e2f16408efa2f8ca79e9679d5f78857fc66d2.tar.gz cpython-0c6e2f16408efa2f8ca79e9679d5f78857fc66d2.tar.bz2 | |
Remove some shadowed variables
| -rw-r--r-- | Objects/abstract.c | 2 | ||||
| -rw-r--r-- | Objects/setobject.c | 2 | ||||
| -rw-r--r-- | Objects/weakrefobject.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 6e070a9..8a5166e 100644 --- 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 d39f265..2494bae 100644 --- 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 1de9434..fd99a63 100644 --- 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); |