From 16996d145b15ad5f41b1ffd73434d7c984645d7e Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Thu, 9 Nov 2023 12:36:21 +1300 Subject: [PATCH] util/charset: Rename utf16_len() to utf16_null_terminated_len() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The new name indicates that — contrary to functions such as strnlen() — the length may include the terminator. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- lib/util/charset/charset.h | 2 +- lib/util/charset/util_unistr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index df8aa0de862..f350e748c07 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -107,7 +107,7 @@ size_t ucs2_align(const void *base_ptr, const void *p, int flags); return the number of bytes occupied by a buffer in CH_UTF16 format the result includes the null termination **/ -size_t utf16_len(const void *buf); +size_t utf16_null_terminated_len(const void *buf); /** return the number of bytes occupied by a buffer in CH_UTF16 format diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c index 260692aceac..c94068819ce 100644 --- a/lib/util/charset/util_unistr.c +++ b/lib/util/charset/util_unistr.c @@ -195,7 +195,7 @@ size_t ucs2_align(const void *base_ptr, const void *p, int flags) return the number of bytes occupied by a buffer in CH_UTF16 format the result includes the null termination **/ -size_t utf16_len(const void *buf) +size_t utf16_null_terminated_len(const void *buf) { size_t len; @@ -501,7 +501,7 @@ static size_t pull_ucs2(char *dest, const void *src, size_t dest_len, size_t src if (flags & STR_TERMINATE) { if (src_len == (size_t)-1) { - src_len = utf16_len(src); + src_len = utf16_null_terminated_len(src); } else { src_len = utf16_null_terminated_len_n(src, src_len); } -- 2.47.3