Minor code cleanups.

rhettinger · rhettinger · commit 99bf9a256754 · 2015-05-11T19:25:32.000-07:00
diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c
@@ -138,7 +138,7 @@ heappop_internal(PyObject *heap, int siftup_func(PyListObject *, Py_ssize_t))
 
     lastelt = PyList_GET_ITEM(heap, n-1) ;
     Py_INCREF(lastelt);
-    if (PyList_SetSlice(heap, n-1, n, NULL) < 0) {
+    if (PyList_SetSlice(heap, n-1, n, NULL)) {
         Py_DECREF(lastelt);
         return NULL;
     }
@@ -177,7 +177,7 @@ heapreplace_internal(PyObject *args, int siftup_func(PyListObject *, Py_ssize_t)
         return NULL;
     }
 
-    if (PyList_GET_SIZE(heap) < 1) {
+    if (PyList_GET_SIZE(heap) == 0) {
         PyErr_SetString(PyExc_IndexError, "index out of range");
         return NULL;
     }
@@ -222,7 +222,7 @@ heappushpop(PyObject *self, PyObject *args)
         return NULL;
     }
 
-    if (PyList_GET_SIZE(heap) < 1) {
+    if (PyList_GET_SIZE(heap) == 0) {
         Py_INCREF(item);
         return item;
     }
@@ -340,8 +340,8 @@ heapify_internal(PyObject *heap, int siftup_func(PyListObject *, Py_ssize_t))
        n is odd = 2*j+1, this is (2*j+1-1)/2 = j so j-1 is the largest,
        and that's again n//2-1.
     */
-    for (i=n/2-1 ; i>=0 ; i--)
-        if(siftup_func((PyListObject *)heap, i))
+    for (i = n/2 - 1 ; i >= 0 ; i--)
+        if (siftup_func((PyListObject *)heap, i))
             return NULL;
     Py_RETURN_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ heappop_internal(PyObject heap, int siftup_func(PyListObject , Py_ssize_t))`
`138`	`138`
`139`	`139`	`lastelt = PyList_GET_ITEM(heap, n-1) ;`
`140`	`140`	`Py_INCREF(lastelt);`
`141`		`- if (PyList_SetSlice(heap, n-1, n, NULL) < 0) {`
	`141`	`+ if (PyList_SetSlice(heap, n-1, n, NULL)) {`
`142`	`142`	`Py_DECREF(lastelt);`
`143`	`143`	`return NULL;`
`144`	`144`	`}`
`@@ -177,7 +177,7 @@ heapreplace_internal(PyObject args, int siftup_func(PyListObject , Py_ssize_t)`
`177`	`177`	`return NULL;`
`178`	`178`	`}`
`179`	`179`
`180`		`- if (PyList_GET_SIZE(heap) < 1) {`
	`180`	`+ if (PyList_GET_SIZE(heap) == 0) {`
`181`	`181`	`PyErr_SetString(PyExc_IndexError, "index out of range");`
`182`	`182`	`return NULL;`
`183`	`183`	`}`
`@@ -222,7 +222,7 @@ heappushpop(PyObject self, PyObject args)`
`222`	`222`	`return NULL;`
`223`	`223`	`}`
`224`	`224`
`225`		`- if (PyList_GET_SIZE(heap) < 1) {`
	`225`	`+ if (PyList_GET_SIZE(heap) == 0) {`
`226`	`226`	`Py_INCREF(item);`
`227`	`227`	`return item;`
`228`	`228`	`}`
`@@ -340,8 +340,8 @@ heapify_internal(PyObject heap, int siftup_func(PyListObject , Py_ssize_t))`
`340`	`340`	`n is odd = 2j+1, this is (2j+1-1)/2 = j so j-1 is the largest,`
`341`	`341`	`and that's again n//2-1.`
`342`	`342`	`*/`
`343`		`- for (i=n/2-1 ; i>=0 ; i--)`
`344`		`- if(siftup_func((PyListObject *)heap, i))`
	`343`	`+ for (i = n/2 - 1 ; i >= 0 ; i--)`
	`344`	`+ if (siftup_func((PyListObject *)heap, i))`
`345`	`345`	`return NULL;`
`346`	`346`	`Py_RETURN_NONE;`
`347`	`347`	`}`