Minor code simplification by eliminating an unnecessary temporary variable.

rhettinger · rhettinger · commit b97cc49c3a48 · 2013-07-21T01:51:07.000-07:00
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
@@ -491,7 +491,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
             b = NULL;
         }
         assert(leftindex > 0);
-
         {
             PyObject **src, **dest;
             Py_ssize_t m = n;
@@ -510,15 +509,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
                 *(dest--) = *(src--);
             } while (--m);
         }
-
         if (rightindex == -1) {
-            block *prevblock = rightblock->leftlink;
             assert(leftblock != rightblock);
             assert(b == NULL);
             b = rightblock;
-            CHECK_NOT_END(prevblock);
-            MARK_END(prevblock->rightlink);
-            rightblock = prevblock;
+            CHECK_NOT_END(rightblock->leftlink);
+            rightblock = rightblock->leftlink;
+            MARK_END(rightblock->rightlink);
             rightindex = BLOCKLEN - 1;
         }
     }
@@ -538,7 +535,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
             b = NULL;
         }
         assert (rightindex < BLOCKLEN - 1);
-
         {
             PyObject **src, **dest;
             Py_ssize_t m = -n;
@@ -557,15 +553,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
                 *(dest++) = *(src++);
             } while (--m);
         }
-
         if (leftindex == BLOCKLEN) {
-            block *nextblock = leftblock->rightlink;
             assert(leftblock != rightblock);
             assert(b == NULL);
             b = leftblock;
-            CHECK_NOT_END(nextblock);
-            MARK_END(nextblock->leftlink);
-            leftblock = nextblock;
+            CHECK_NOT_END(leftblock->rightlink);
+            leftblock = leftblock->rightlink;
+            MARK_END(leftblock->leftlink);
             leftindex = 0;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)`
`491`	`491`	`b = NULL;`
`492`	`492`	`}`
`493`	`493`	`assert(leftindex > 0);`
`494`		`-`
`495`	`494`	`{`
`496`	`495`	`PyObject src, dest;`
`497`	`496`	`Py_ssize_t m = n;`
`@@ -510,15 +509,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)`
`510`	`509`	`(dest--) = (src--);`
`511`	`510`	`} while (--m);`
`512`	`511`	`}`
`513`		`-`
`514`	`512`	`if (rightindex == -1) {`
`515`		`- block *prevblock = rightblock->leftlink;`
`516`	`513`	`assert(leftblock != rightblock);`
`517`	`514`	`assert(b == NULL);`
`518`	`515`	`b = rightblock;`
`519`		`- CHECK_NOT_END(prevblock);`
`520`		`- MARK_END(prevblock->rightlink);`
`521`		`- rightblock = prevblock;`
	`516`	`+ CHECK_NOT_END(rightblock->leftlink);`
	`517`	`+ rightblock = rightblock->leftlink;`
	`518`	`+ MARK_END(rightblock->rightlink);`
`522`	`519`	`rightindex = BLOCKLEN - 1;`
`523`	`520`	`}`
`524`	`521`	`}`
`@@ -538,7 +535,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)`
`538`	`535`	`b = NULL;`
`539`	`536`	`}`
`540`	`537`	`assert (rightindex < BLOCKLEN - 1);`
`541`		`-`
`542`	`538`	`{`
`543`	`539`	`PyObject src, dest;`
`544`	`540`	`Py_ssize_t m = -n;`
`@@ -557,15 +553,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)`
`557`	`553`	`(dest++) = (src++);`
`558`	`554`	`} while (--m);`
`559`	`555`	`}`
`560`		`-`
`561`	`556`	`if (leftindex == BLOCKLEN) {`
`562`		`- block *nextblock = leftblock->rightlink;`
`563`	`557`	`assert(leftblock != rightblock);`
`564`	`558`	`assert(b == NULL);`
`565`	`559`	`b = leftblock;`
`566`		`- CHECK_NOT_END(nextblock);`
`567`		`- MARK_END(nextblock->leftlink);`
`568`		`- leftblock = nextblock;`
	`560`	`+ CHECK_NOT_END(leftblock->rightlink);`
	`561`	`+ leftblock = leftblock->rightlink;`
	`562`	`+ MARK_END(leftblock->leftlink);`
`569`	`563`	`leftindex = 0;`
`570`	`564`	`}`
`571`	`565`	`}`