From: Cliff Woolley <jwoolley@apache.org>
Date: Wed, 14 Aug 2002 00:46:50 +0000 (+0000)
Subject: make this more gdb-friendly.  no functional change.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=210eb96dfc22163e22a5e9bd19425fee5f895ed5;p=apache

make this more gdb-friendly.  no functional change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96371 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/experimental/cache_pqueue.c b/modules/experimental/cache_pqueue.c
index 10ddd3a8ea..144e7c65c5 100644
--- a/modules/experimental/cache_pqueue.c
+++ b/modules/experimental/cache_pqueue.c
@@ -304,13 +304,21 @@ void cache_pq_print(cache_pqueue_t *q,
 
 static int cache_pq_subtree_is_valid(cache_pqueue_t *q, int pos)
 {
-    if ((left(pos) <q->size &&(q->pri(q->d[pos]) < q->pri(q->d[left(pos)]))) ||
-        (right(pos)<q->size &&(q->pri(q->d[pos]) < q->pri(q->d[right(pos)]))))
-    {
-        return 0;
+    if (left(pos) < q->size) {
+        /* has a left child */
+        if (q->pri(q->d[pos]) < q->pri(q->d[left(pos)]))
+            return 0;
+        if (!cache_pq_subtree_is_valid(q, left(pos)))
+            return 0;
+    }
+    if (right(pos) < q->size) {
+        /* has a right child */
+        if (q->pri(q->d[pos]) < q->pri(q->d[right(pos)]))
+            return 0;
+        if (!cache_pq_subtree_is_valid(q, right(pos)))
+            return 0;
     }
-    return ((left(pos)>=q->size ||(cache_pq_subtree_is_valid(q, left(pos)))) &&
-            (right(pos)>=q->size||(cache_pq_subtree_is_valid(q, right(pos)))));
+    return 1;
 }
 
 int cache_pq_is_valid(cache_pqueue_t *q)