QNetworkAccessCache: Style fixes and move asserts

Change-Id: I300d2525d9987737697e2cc6a326be19554902c8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp
index 9e5d10ddd7..40aa503732 100644
--- a/src/network/access/qnetworkaccesscache.cpp
+++ b/src/network/access/qnetworkaccesscache.cpp
@@ -167,22 +167,18 @@ void QNetworkAccessCache::linkEntry(const QByteArray &key)
             node->previous = lastExpiringNode;
             lastExpiringNode->next = node;
             lastExpiringNode = node;
-            Q_ASSERT(lastExpiringNode->next == nullptr);
         } else {
             // Insert in a sorted way, as different nodes might have had different expiryTimeoutSeconds set.
             Node *current = lastExpiringNode;
-            while (current->previous != nullptr && current->previous->timer >= node->timer) {
+            while (current->previous != nullptr && current->previous->timer >= node->timer)
                 current = current->previous;
-            }
             node->previous = current->previous;
             if (node->previous)
                 node->previous->next = node;
             node->next = current;
             current->previous = node;
-            if (node->previous == nullptr) {
+            if (node->previous == nullptr)
                 firstExpiringNode = node;
-                Q_ASSERT(firstExpiringNode->previous == nullptr);
-            }
         }
     } else {
         // no current last-to-expire node
@@ -192,6 +188,8 @@ void QNetworkAccessCache::linkEntry(const QByteArray &key)
         // there are no entries, so this is the next-to-expire too
         firstExpiringNode = node;
     }
+    Q_ASSERT(firstExpiringNode->previous == nullptr);
+    Q_ASSERT(lastExpiringNode->next == nullptr);
 }
 
 /*!