From: Raymond Hettinger Date: Sun, 7 Jul 2013 03:49:06 +0000 (-1000) Subject: Improve variable names in deque_count() X-Git-Tag: v3.4.0a1~315 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3a67b7e57abc2085e4c62f7be2712943a84dedc;p=python Improve variable names in deque_count() --- diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 9e0d8f5d30..d407ff402d 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -581,8 +581,8 @@ PyDoc_STRVAR(reverse_doc, static PyObject * deque_count(dequeobject *deque, PyObject *v) { - block *leftblock = deque->leftblock; - Py_ssize_t leftindex = deque->leftindex; + block *b = deque->leftblock; + Py_ssize_t index = deque->leftindex; Py_ssize_t n = Py_SIZE(deque); Py_ssize_t i; Py_ssize_t count = 0; @@ -591,8 +591,8 @@ deque_count(dequeobject *deque, PyObject *v) int cmp; for (i=0 ; idata[leftindex]; + assert(b != NULL); + item = b->data[index]; cmp = PyObject_RichCompareBool(item, v, Py_EQ); if (cmp > 0) count++; @@ -606,10 +606,10 @@ deque_count(dequeobject *deque, PyObject *v) } /* Advance left block/index pair */ - leftindex++; - if (leftindex == BLOCKLEN) { - leftblock = leftblock->rightlink; - leftindex = 0; + index++; + if (index == BLOCKLEN) { + b = b->rightlink; + index = 0; } } return PyLong_FromSsize_t(count);