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 6eb3f50269186a57a0dea4a1ceb405678bad69e8..7d8ff68074bb96b405ef5b83a7af48324c9f31a5 100644 (file)
--- 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;
 }