oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/icu/Converter: pass std::string_view

Browse Source
This commit is contained in:
Max Kellermann 2020-04-03 15:04:57 +02:00
parent 9dc530ab51
commit 09d8e44d56
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/icu/Converter.cxx
View File

@ -78,13 +78,13 @@ IcuConverter::Create(const char *charset)
#elif defined(HAVE_ICONV) #elif defined(HAVE_ICONV)
static AllocatedString<char> static AllocatedString<char>
DoConvert(iconv_t conv, const char *src) DoConvert(iconv_t conv, std::string_view src)
{ {
// TODO: dynamic buffer? // TODO: dynamic buffer?
char buffer[4096]; char buffer[4096];
char *in = const_cast<char *>(src); char *in = const_cast<char *>(src.data());
char *out = buffer; char *out = buffer;
size_t in_left = strlen(src); size_t in_left = src.size();
size_t out_left = sizeof(buffer); size_t out_left = sizeof(buffer);
size_t n = iconv(conv, &in, &in_left, &out, &out_left); size_t n = iconv(conv, &in, &in_left, &out, &out_left);
@ -101,7 +101,7 @@ DoConvert(iconv_t conv, const char *src)
#endif #endif
AllocatedString<char> AllocatedString<char>
IcuConverter::ToUTF8(const char *s) const IcuConverter::ToUTF8(std::string_view s) const
{ {
#ifdef HAVE_ICU #ifdef HAVE_ICU
const std::lock_guard<Mutex> protect(mutex); const std::lock_guard<Mutex> protect(mutex);
@ -110,12 +110,12 @@ IcuConverter::ToUTF8(const char *s) const
// TODO: dynamic buffer? // TODO: dynamic buffer?
UChar buffer[4096], *target = buffer; UChar buffer[4096], *target = buffer;
const char *source = s; const char *source = s.data();
UErrorCode code = U_ZERO_ERROR; UErrorCode code = U_ZERO_ERROR;
ucnv_toUnicode(converter, &target, buffer + std::size(buffer), ucnv_toUnicode(converter, &target, buffer + std::size(buffer),
&source, source + strlen(source), &source, source + s.size(),
nullptr, true, &code); nullptr, true, &code);
if (code != U_ZERO_ERROR) if (code != U_ZERO_ERROR)
throw std::runtime_error(FormatString("Failed to convert to Unicode: %s", throw std::runtime_error(FormatString("Failed to convert to Unicode: %s",
@ -129,7 +129,7 @@ IcuConverter::ToUTF8(const char *s) const
} }
AllocatedString<char> AllocatedString<char>
IcuConverter::FromUTF8(const char *s) const IcuConverter::FromUTF8(std::string_view s) const
{ {
#ifdef HAVE_ICU #ifdef HAVE_ICU
const std::lock_guard<Mutex> protect(mutex); const std::lock_guard<Mutex> protect(mutex);

4
src/lib/icu/Converter.hxx
View File

@ -84,7 +84,7 @@ public:
* Throws std::runtime_error on error. * Throws std::runtime_error on error.
*/ */
gcc_nonnull_all gcc_nonnull_all
AllocatedString<char> ToUTF8(const char *s) const; AllocatedString<char> ToUTF8(std::string_view s) const;
/** /**
* Convert the string from UTF-8. * Convert the string from UTF-8.
@ -92,7 +92,7 @@ public:
* Throws std::runtime_error on error. * Throws std::runtime_error on error.
*/ */
gcc_nonnull_all gcc_nonnull_all
AllocatedString<char> FromUTF8(const char *s) const; AllocatedString<char> FromUTF8(std::string_view s) const;
}; };
#endif #endif