From 5b869b233d5f927f03dc9a70a7006c7dcbf5c88e Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 14 May 2018 15:24:16 +1000 Subject: Use string_view for UniConversion functions. --- src/Document.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/Document.cxx') diff --git a/src/Document.cxx b/src/Document.cxx index fbe387f6d..bcc368a68 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2939,12 +2939,13 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci: bool matched = false; if (SC_CP_UTF8 == doc->dbcsCodePage) { - const size_t lenS = strlen(s); - std::vector ws(lenS + 1); + const std::string_view sv(s); + const size_t lenS = sv.length(); + std::vector ws(sv.length() + 1); #if WCHAR_T_IS_16 - const size_t outLen = UTF16FromUTF8(s, lenS, &ws[0], lenS); + const size_t outLen = UTF16FromUTF8(sv, &ws[0], lenS); #else - const size_t outLen = UTF32FromUTF8(s, lenS, reinterpret_cast(&ws[0]), lenS); + const size_t outLen = UTF32FromUTF8(sv, reinterpret_cast(&ws[0]), lenS); #endif ws[outLen] = 0; std::wregex regexp; -- cgit v1.2.3