diff options
| author | nikita <nikita@NetBSD.org> | 2021-01-13 00:53:52 +0100 |
|---|---|---|
| committer | nikita <nikita@NetBSD.org> | 2021-01-13 00:53:52 +0100 |
| commit | 5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb (patch) | |
| tree | d69e840805484efba1885154b855bf93409248cb /lib/splay.h | |
| parent | 7bd28f37397837d72302550e43d95060413e9eb8 (diff) | |
| parent | e052859759b34d0e05ce0f17244873e5cd7b457b (diff) | |
| download | gnurl-5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb.tar.gz gnurl-5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb.tar.bz2 gnurl-5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb.zip | |
Merge tag 'curl-7_74_0'
7.74.0
Diffstat (limited to 'lib/splay.h')
| -rw-r--r-- | lib/splay.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib/splay.h b/lib/splay.h index 9292f349b..eb9f65f1e 100644 --- a/lib/splay.h +++ b/lib/splay.h @@ -7,11 +7,11 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1997 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1997 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at https://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is @@ -40,19 +40,13 @@ struct Curl_tree *Curl_splayinsert(struct curltime key, struct Curl_tree *t, struct Curl_tree *newnode); -#if 0 -struct Curl_tree *Curl_splayremove(struct curltime key, - struct Curl_tree *t, - struct Curl_tree **removed); -#endif - struct Curl_tree *Curl_splaygetbest(struct curltime key, struct Curl_tree *t, struct Curl_tree **removed); -int Curl_splayremovebyaddr(struct Curl_tree *t, - struct Curl_tree *removenode, - struct Curl_tree **newroot); +int Curl_splayremove(struct Curl_tree *t, + struct Curl_tree *removenode, + struct Curl_tree **newroot); #define Curl_splaycomparekeys(i,j) ( ((i.tv_sec) < (j.tv_sec)) ? -1 : \ ( ((i.tv_sec) > (j.tv_sec)) ? 1 : \ |