From d8760ab5cf8378fa50e48453149e96a1392253e2 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Sun, 15 Sep 2024 19:20:44 +0200 Subject: Shorten the string view type names --- lib/mbstring/u8chk.c | 2 +- lib/mbstring/u8chr.c | 2 +- lib/mbstring/u8cmp.c | 2 +- lib/mbstring/u8cspn.c | 2 +- lib/mbstring/u8cut.c | 2 +- lib/mbstring/u8haspfx.c | 2 +- lib/mbstring/u8hassfx.c | 2 +- lib/mbstring/u8len.c | 2 +- lib/mbstring/u8next.c | 2 +- lib/mbstring/u8rchr.c | 2 +- lib/mbstring/u8spn.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'lib/mbstring') diff --git a/lib/mbstring/u8chk.c b/lib/mbstring/u8chk.c index bf93005..332a450 100644 --- a/lib/mbstring/u8chk.c +++ b/lib/mbstring/u8chk.c @@ -2,7 +2,7 @@ #include "rune.h" const char8_t * -u8chk(struct u8view sv) +u8chk(u8view_t sv) { int w; rune ch; diff --git a/lib/mbstring/u8chr.c b/lib/mbstring/u8chr.c index 4831695..5ddcdd8 100644 --- a/lib/mbstring/u8chr.c +++ b/lib/mbstring/u8chr.c @@ -74,7 +74,7 @@ memmem4(const char8_t *h, size_t k, const char8_t *n) } const char8_t * -u8chr(struct u8view sv, rune ch) +u8chr(u8view_t sv, rune ch) { char8_t buf[U8_LEN_MAX]; int m = rtou8(buf, sizeof(buf), ch); diff --git a/lib/mbstring/u8cmp.c b/lib/mbstring/u8cmp.c index e54f984..5c56878 100644 --- a/lib/mbstring/u8cmp.c +++ b/lib/mbstring/u8cmp.c @@ -6,7 +6,7 @@ y.len both being 0 */ int -u8cmp(struct u8view x, struct u8view y) +u8cmp(u8view_t x, u8view_t y) { if (x.len != y.len) return x.len > y.len ? +1 : -1; diff --git a/lib/mbstring/u8cspn.c b/lib/mbstring/u8cspn.c index 827373f..cdeb659 100644 --- a/lib/mbstring/u8cspn.c +++ b/lib/mbstring/u8cspn.c @@ -1,7 +1,7 @@ #include "mbstring.h" size_t -u8cspn(struct u8view sv, const rune *p, size_t n) +u8cspn(u8view_t sv, const rune *p, size_t n) { rune ch; size_t k, w; diff --git a/lib/mbstring/u8cut.c b/lib/mbstring/u8cut.c index 3dd9663..36df561 100644 --- a/lib/mbstring/u8cut.c +++ b/lib/mbstring/u8cut.c @@ -2,7 +2,7 @@ #include "mbstring.h" rune -u8cut(struct u8view *restrict x, struct u8view *restrict y, const rune *seps, +u8cut(u8view_t *restrict x, u8view_t *restrict y, const rune *seps, size_t n) { ASSUME(y != nullptr); diff --git a/lib/mbstring/u8haspfx.c b/lib/mbstring/u8haspfx.c index c61efbb..abc5e76 100644 --- a/lib/mbstring/u8haspfx.c +++ b/lib/mbstring/u8haspfx.c @@ -4,7 +4,7 @@ #include "mbstring.h" bool -u8haspfx(struct u8view sv, struct u8view pfx) +u8haspfx(u8view_t sv, u8view_t pfx) { return sv.len >= pfx.len && memeq(sv.p, pfx.p, pfx.len); } diff --git a/lib/mbstring/u8hassfx.c b/lib/mbstring/u8hassfx.c index 8ea4456..ac72778 100644 --- a/lib/mbstring/u8hassfx.c +++ b/lib/mbstring/u8hassfx.c @@ -4,7 +4,7 @@ #include "mbstring.h" bool -u8hassfx(struct u8view sv, struct u8view sfx) +u8hassfx(u8view_t sv, u8view_t sfx) { return sv.len >= sfx.len && memeq(sv.p + sv.len - sfx.len, sfx.p, sfx.len); } diff --git a/lib/mbstring/u8len.c b/lib/mbstring/u8len.c index 23c55c5..26696a3 100644 --- a/lib/mbstring/u8len.c +++ b/lib/mbstring/u8len.c @@ -1,7 +1,7 @@ #include "mbstring.h" size_t -u8len(struct u8view sv) +u8len(u8view_t sv) { size_t m = 0; while (u8next(nullptr, &sv)) diff --git a/lib/mbstring/u8next.c b/lib/mbstring/u8next.c index 518de49..fe2dabf 100644 --- a/lib/mbstring/u8next.c +++ b/lib/mbstring/u8next.c @@ -1,7 +1,7 @@ #include "mbstring.h" int -u8next(rune *ch, struct u8view *sv) +u8next(rune *ch, u8view_t *sv) { int n = 0; diff --git a/lib/mbstring/u8rchr.c b/lib/mbstring/u8rchr.c index 825f8fd..47eaa4c 100644 --- a/lib/mbstring/u8rchr.c +++ b/lib/mbstring/u8rchr.c @@ -64,7 +64,7 @@ memrchr4(const char8_t *h, size_t k, const char8_t *n) } const char8_t * -u8rchr(struct u8view sv, rune ch) +u8rchr(u8view_t sv, rune ch) { char8_t buf[U8_LEN_MAX]; int n = rtou8(buf, ch, sizeof(buf)); diff --git a/lib/mbstring/u8spn.c b/lib/mbstring/u8spn.c index d41fcbc..f704ff8 100644 --- a/lib/mbstring/u8spn.c +++ b/lib/mbstring/u8spn.c @@ -1,7 +1,7 @@ #include "mbstring.h" size_t -u8spn(struct u8view sv, const rune *p, size_t n) +u8spn(u8view_t sv, const rune *p, size_t n) { rune ch; size_t k = 0, w; -- cgit v1.2.3