diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 05:36:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 05:36:20 +0000 |
| commit | 30bdda11e00c2f13bab72d670fe57959d285a265 (patch) | |
| tree | 0273928608e7585e4523f3bd08384af52fbbc78a /src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_ksl.c | |
| parent | Releasing progress-linux version 3.3.6-3~progress7.99u1. (diff) | |
| download | knot-30bdda11e00c2f13bab72d670fe57959d285a265.tar.xz knot-30bdda11e00c2f13bab72d670fe57959d285a265.zip | |
Merging upstream version 3.3.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_ksl.c')
| -rw-r--r-- | src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_ksl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_ksl.c b/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_ksl.c index 0ccc048..a7284bd 100644 --- a/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_ksl.c +++ b/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_ksl.c @@ -60,8 +60,7 @@ void ngtcp2_ksl_init(ngtcp2_ksl *ksl, ngtcp2_ksl_compar compar, size_t keylen, size_t nodelen = ksl_nodelen(keylen); ngtcp2_objalloc_init(&ksl->blkalloc, - ((ksl_blklen(nodelen) + 0xfu) & ~(uintptr_t)0xfu) * 8, - mem); + (ksl_blklen(nodelen) + 0xfu) & ~(uintptr_t)0xfu, mem); ksl->head = NULL; ksl->front = ksl->back = NULL; @@ -818,6 +817,6 @@ int ngtcp2_ksl_range_compar(const ngtcp2_ksl_key *lhs, int ngtcp2_ksl_range_exclusive_compar(const ngtcp2_ksl_key *lhs, const ngtcp2_ksl_key *rhs) { const ngtcp2_range *a = lhs, *b = rhs; - return a->begin < b->begin && - !(ngtcp2_max(a->begin, b->begin) < ngtcp2_min(a->end, b->end)); + return a->begin < b->begin && !(ngtcp2_max_uint64(a->begin, b->begin) < + ngtcp2_min_uint64(a->end, b->end)); } |