[Python-checkins] cpython: Minor code simplification by eliminating an unnecessary temporary variable.

[raymond.hettinger]

http://hg.python.org/cpython/rev/f49a43dcdcef
changeset:   84759:f49a43dcdcef
user:        Raymond Hettinger <python at rcn.com>
date:        Sun Jul 21 01:51:07 2013 -0700
summary:
  Minor code simplification by eliminating an unnecessary temporary variable.

files:
  Modules/_collectionsmodule.c |  18 ++++++------------
  1 files changed, 6 insertions(+), 12 deletions(-)


diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -491,7 +491,6 @@
             b = NULL;
         }
         assert(leftindex > 0);
-
         {
             PyObject **src, **dest;
             Py_ssize_t m = n;
@@ -510,15 +509,13 @@
                 *(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 @@
             b = NULL;
         }
         assert (rightindex < BLOCKLEN - 1);
-
         {
             PyObject **src, **dest;
             Py_ssize_t m = -n;
@@ -557,15 +553,13 @@
                 *(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;
         }
     }

-- 
Repository URL: http://hg.python.org/cpython