From 045f4bb5b1767140c4f6cfe2d2002553925c4205 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Wed, 30 Oct 2024 08:28:15 +0100 Subject: Make string view lengths signed --- lib/unicode/string/u8gnext.c | 2 +- lib/unicode/string/u8wnext.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/unicode') diff --git a/lib/unicode/string/u8gnext.c b/lib/unicode/string/u8gnext.c index 7c551f7..6e91cf7 100644 --- a/lib/unicode/string/u8gnext.c +++ b/lib/unicode/string/u8gnext.c @@ -35,7 +35,7 @@ u8gnext(u8view_t *g, u8view_t *sv) for (;;) { rune ch2; - if ((size_t)(p - sv->p) >= sv->len) + if (p - sv->p >= sv->len) ch2 = 0; else m = u8tor(&ch2, p); diff --git a/lib/unicode/string/u8wnext.c b/lib/unicode/string/u8wnext.c index 493ec9f..da11f4a 100644 --- a/lib/unicode/string/u8wnext.c +++ b/lib/unicode/string/u8wnext.c @@ -22,7 +22,7 @@ struct wbrk_state { }; static bool advance(struct wbrk_state *); -static size_t findwbrk(u8view_t); +static ptrdiff_t findwbrk(u8view_t); static struct wbrk_state mkwbrkstate(u8view_t); size_t @@ -34,7 +34,7 @@ u8wnext(u8view_t *w, u8view_t *sv) if (sv->len == 0) return 0; - size_t off = findwbrk(*sv); + ptrdiff_t off = findwbrk(*sv); if (w != nullptr) *w = (u8view_t){sv->p, off}; @@ -43,7 +43,7 @@ u8wnext(u8view_t *w, u8view_t *sv) return off; } -size_t +ptrdiff_t findwbrk(u8view_t sv) { ASSUME(sv.p != nullptr); -- cgit v1.2.3