From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Wed, 8 Nov 2023 23:46:17 +0000 (+1300)
Subject: util/charset: Prefer PULL_LE_U16() to older SVAL() macro
X-Git-Tag: talloc-2.4.2~676
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec3e420840eded527a2a7bb1177b5daa79ee8448;p=thirdparty%2Fsamba.git

util/charset: Prefer PULL_LE_U16() to older SVAL() macro

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index 6eb3f502691..7d8ff68074b 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -198,7 +198,7 @@ size_t utf16_len(const void *buf)
 {
 	size_t len;
 
-	for (len = 0; SVAL(buf,len); len += 2) ;
+	for (len = 0; PULL_LE_U16(buf,len); len += 2) ;
 
 	return len;
 }
@@ -220,7 +220,7 @@ size_t utf16_len_n(const void *src, size_t n)
 {
 	size_t len;
 
-	for (len = 0; (len+2 <= n) && SVAL(src, len); len += 2) ;
+	for (len = 0; (len+2 <= n) && PULL_LE_U16(src, len); len += 2) ;
 
 	return len;
 }