1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkAccessCache: Style fixes and move asserts

Browse Source 
Change-Id: I300d2525d9987737697e2cc6a326be19554902c8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Mårten Nordheim 2021-08-31 16:20:09 +02:00
parent a253bec500
commit 05c9894330
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/access/qnetworkaccesscache.cpp
View File

@ -167,22 +167,18 @@ void QNetworkAccessCache::linkEntry(const QByteArray &key)
node->previous = lastExpiringNode; node->previous = lastExpiringNode;
lastExpiringNode->next = node; lastExpiringNode->next = node;
lastExpiringNode = node; lastExpiringNode = node;
Q_ASSERT(lastExpiringNode->next == nullptr);
} else { } else {
// Insert in a sorted way, as different nodes might have had different expiryTimeoutSeconds set. // Insert in a sorted way, as different nodes might have had different expiryTimeoutSeconds set.
Node *current = lastExpiringNode; Node *current = lastExpiringNode;
while (current->previous != nullptr && current->previous->timer >= node->timer) { while (current->previous != nullptr && current->previous->timer >= node->timer)
current = current->previous; current = current->previous;
}
node->previous = current->previous; node->previous = current->previous;
if (node->previous) if (node->previous)
node->previous->next = node; node->previous->next = node;
node->next = current; node->next = current;
current->previous = node; current->previous = node;
if (node->previous == nullptr) { if (node->previous == nullptr)
firstExpiringNode = node; firstExpiringNode = node;
Q_ASSERT(firstExpiringNode->previous == nullptr);
}
} }
} else { } else {
// no current last-to-expire node // 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 // there are no entries, so this is the next-to-expire too
firstExpiringNode = node; firstExpiringNode = node;
} }
Q_ASSERT(firstExpiringNode->previous == nullptr);
Q_ASSERT(lastExpiringNode->next == nullptr);
} }
/*! /*!