curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-01 18:05:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

splay: rename KEY_NOTUSED TO SPLAY_SUBNODE

Browse Source 
- explains its purpose better
- make it global static const
- added an assert for a condition that should never happen (that we
  also catch run-time)

Closes #18152
This commit is contained in:
Daniel Stenberg 2025-08-03 21:15:18 +02:00
parent d07504aa8d
commit 40caca581f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/splay.c
View File

@ -94,6 +94,10 @@ struct Curl_tree *Curl_splay(struct curltime i,
return t; return t;
} }
static const struct curltime SPLAY_SUBNODE = {
~0, -1
};
/* Insert key i into the tree t. Return a pointer to the resulting tree or /* Insert key i into the tree t. Return a pointer to the resulting tree or
* NULL if something went wrong. * NULL if something went wrong.
* *
@ -103,10 +107,6 @@ struct Curl_tree *Curl_splayinsert(struct curltime i,
struct Curl_tree *t, struct Curl_tree *t,
struct Curl_tree *node) struct Curl_tree *node)
{ {
static const struct curltime KEY_NOTUSED = {
~0, -1
}; /* will *NEVER* appear */
DEBUGASSERT(node); DEBUGASSERT(node);
if(t) { if(t) {
@ -117,8 +117,7 @@ struct Curl_tree *Curl_splayinsert(struct curltime i,
doubly-linked circular list of nodes. We add the new 'node' struct to doubly-linked circular list of nodes. We add the new 'node' struct to
the end of this list. */ the end of this list. */
node->key = KEY_NOTUSED; /* we set the key in the sub node to NOTUSED node->key = SPLAY_SUBNODE; /* identify this node as a subnode */
to quickly identify this node as a subnode */
node->samen = t; node->samen = t;
node->samep = t->samep; node->samep = t->samep;
t->samep->samen = node; t->samep->samen = node;
@ -214,9 +213,6 @@ int Curl_splayremove(struct Curl_tree *t,
struct Curl_tree *removenode, struct Curl_tree *removenode,
struct Curl_tree **newroot) struct Curl_tree **newroot)
{ {
static const struct curltime KEY_NOTUSED = {
~0, -1
}; /* will *NEVER* appear */
struct Curl_tree *x; struct Curl_tree *x;
if(!t) if(!t)
@ -224,11 +220,11 @@ int Curl_splayremove(struct Curl_tree *t,
DEBUGASSERT(removenode); DEBUGASSERT(removenode);
if(compare(KEY_NOTUSED, removenode->key) == 0) { if(compare(SPLAY_SUBNODE, removenode->key) == 0) {
/* Key set to NOTUSED means it is a subnode within a 'same' linked list /* It is a subnode within a 'same' linked list and thus we can unlink it
and thus we can unlink it easily. */ easily. */
if(removenode->samen == removenode) if(removenode->samen == removenode)
/* A non-subnode should never be set to KEY_NOTUSED */ /* A non-subnode should never be set to SPLAY_SUBNODE */
return 3; return 3;
removenode->samep->samen = removenode->samen; removenode->samep->samen = removenode->samen;
@ -249,8 +245,9 @@ int Curl_splayremove(struct Curl_tree *t,
is not actually in the tree. is not actually in the tree.
We cannot just compare the keys here as a double remove in quick We cannot just compare the keys here as a double remove in quick
succession of a node with key != KEY_NOTUSED && same != NULL succession of a node with key != SPLAY_SUBNODE && same != NULL
could return the same key but a different node. */ could return the same key but a different node. */
DEBUGASSERT(t == removenode);
if(t != removenode) if(t != removenode)
return 2; return 2;