summaryrefslogtreecommitdiff
path: root/lib/multi.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-11-30 17:51:26 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-12-01 08:09:51 +0100
commitb6b535994e7d8d6ee79d5871849b95d53a64dd08 (patch)
tree66104b73cc60e190b02d0646f949d1a9da87eb99 /lib/multi.c
parent2d4d012a49a058ed886ef95cd91b412a98002006 (diff)
downloadcurl-b6b535994e7d8d6ee79d5871849b95d53a64dd08.tar.gz
splay: rename Curl_splayremovebyaddr to Curl_splayremove
... and remove the old unused proto for the old Curl_splayremove version. Closes #6269
Diffstat (limited to 'lib/multi.c')
-rw-r--r--lib/multi.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/multi.c b/lib/multi.c
index d5337e43e..adfbe3f53 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -3375,9 +3375,8 @@ void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)
/* Since this is an updated time, we must remove the previous entry from
the splay tree first and then re-add the new value */
- rc = Curl_splayremovebyaddr(multi->timetree,
- &data->state.timenode,
- &multi->timetree);
+ rc = Curl_splayremove(multi->timetree, &data->state.timenode,
+ &multi->timetree);
if(rc)
infof(data, "Internal error removing splay node = %d\n", rc);
}
@@ -3423,9 +3422,8 @@ void Curl_expire_clear(struct Curl_easy *data)
struct Curl_llist *list = &data->state.timeoutlist;
int rc;
- rc = Curl_splayremovebyaddr(multi->timetree,
- &data->state.timenode,
- &multi->timetree);
+ rc = Curl_splayremove(multi->timetree, &data->state.timenode,
+ &multi->timetree);
if(rc)
infof(data, "Internal error clearing splay node = %d\n", rc);