Use noexcept where sensible. Rename UTF8 string_view parameters for clarity.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/UniConversion.h b/src/UniConversion.h
index a0a1f1a56..836e1e621 100644
--- a/src/UniConversion.h
+++ b/src/UniConversion.h
@@ -14,19 +14,19 @@ const int UTF8MaxBytes = 4;
 
 const int unicodeReplacementChar = 0xFFFD;
 
-size_t UTF8Length(std::wstring_view wsv);
+size_t UTF8Length(std::wstring_view wsv) noexcept;
 size_t UTF8PositionFromUTF16Position(std::string_view u8Text, size_t positionUTF16) noexcept;
 void UTF8FromUTF16(std::wstring_view wsv, char *putf, size_t len);
-void UTF8FromUTF32Character(int uch, char *putf);
-size_t UTF16Length(std::string_view sv);
-size_t UTF16FromUTF8(std::string_view sv, wchar_t *tbuf, size_t tlen);
+void UTF8FromUTF32Character(int uch, char *putf) noexcept;
+size_t UTF16Length(std::string_view svu8) noexcept;
+size_t UTF16FromUTF8(std::string_view svu8, wchar_t *tbuf, size_t tlen);
 size_t UTF32Length(std::string_view svu8) noexcept;
-size_t UTF32FromUTF8(std::string_view sv, unsigned int *tbuf, size_t tlen);
+size_t UTF32FromUTF8(std::string_view svu8, unsigned int *tbuf, size_t tlen);
 // WStringFromUTF8 does the right thing when wchar_t is 2 or 4 bytes so
 // works on both Windows and Unix.
 std::wstring WStringFromUTF8(std::string_view svu8);
 unsigned int UTF16FromUTF32Character(unsigned int val, wchar_t *tbuf) noexcept;
-bool UTF8IsValid(std::string_view sv) noexcept;
+bool UTF8IsValid(std::string_view svu8) noexcept;
 std::string FixInvalidUTF8(const std::string &text);
 
 extern const unsigned char UTF8BytesOfLead[256];