commit b0ab5e964a0494455fce5a2be8a256d143377fec
author Tom Sepez <tsepez@chromium.org> Fri Dec 01 00:30:37 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Dec 01 00:30:37 2023 +0000
tree 96cdeb6a38861c10f6b06e661799c8848088a3f3
parent dbf4b0a4cdf8af4be4fa5b097695762d45ae46b5

Remove unnecessary argument from FuseSurrogates().

The span should be self-describing.

Change-Id: I02312b2ceadc63f78d951fa979c71ad9cb5bfb8d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/114056
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>

core/fxcrt/widestring.cpp

diff --git a/core/fxcrt/widestring.cpp b/core/fxcrt/widestring.cpp
index 11261f1..bfc9555 100644
--- a/core/fxcrt/widestring.cpp
+++ b/core/fxcrt/widestring.cpp
@@ -35,11 +35,11 @@
 namespace {
 
 #if defined(WCHAR_T_IS_32_BIT)
-size_t FuseSurrogates(pdfium::span<wchar_t> s, size_t n) {
+size_t FuseSurrogates(pdfium::span<wchar_t> s) {
   size_t dest_pos = 0;
-  for (size_t i = 0; i < n; ++i) {
+  for (size_t i = 0; i < s.size(); ++i) {
     // TODO(crbug.com/pdfium/2031): Always use UTF-16.
-    if (pdfium::IsHighSurrogate(s[i]) && i + 1 < n &&
+    if (pdfium::IsHighSurrogate(s[i]) && i + 1 < s.size() &&
         pdfium::IsLowSurrogate(s[i + 1])) {
       s[dest_pos++] = pdfium::SurrogatePair(s[i], s[i + 1]).ToCodePoint();
       ++i;
@@ -1050,7 +1050,7 @@
     }
 
 #if defined(WCHAR_T_IS_32_BIT)
-    length = FuseSurrogates(buf, length);
+    length = FuseSurrogates(buf.first(length));
 #endif
   }
   result.ReleaseBuffer(length);
@@ -1072,7 +1072,7 @@
     }
 
 #if defined(WCHAR_T_IS_32_BIT)
-    length = FuseSurrogates(buf, length);
+    length = FuseSurrogates(buf.first(length));
 #endif
   }
   result.ReleaseBuffer(length);