Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove tr_utf8_validate from public API (#3671)

Browse Source 
it was only used as an impl helper, so make it private
This commit is contained in:
Charles Kerr
2022-08-18 13:23:59 -05:00
committed by GitHub
parent 2d3bcebf79
commit c171d6df7c
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libtransmission/utils.cc
View File

@@ -320,7 +320,12 @@ void tr_removeElementFromArray(void* array, size_t index_to_remove, size_t sizeo
**** ****
***/ ***/
bool tr_utf8_validate(std::string_view sv, char const** good_end) namespace
{
namespace tr_strvUtf8Clean_impl
{
bool validateUtf8(std::string_view sv, char const** good_end)
{ {
auto const* begin = std::data(sv); auto const* begin = std::data(sv);
auto const* const end = begin + std::size(sv); auto const* const end = begin + std::size(sv);
@@ -349,10 +354,6 @@ bool tr_utf8_validate(std::string_view sv, char const** good_end)
return all_good; return all_good;
} }
namespace
{
namespace tr_strvUtf8Clean_impl
{
std::string strip_non_utf8(std::string_view sv) std::string strip_non_utf8(std::string_view sv)
{ {
auto out = std::string{}; auto out = std::string{};
@@ -404,7 +405,7 @@ std::string tr_strvUtf8Clean(std::string_view cleanme)
{ {
using namespace tr_strvUtf8Clean_impl; using namespace tr_strvUtf8Clean_impl;
if (tr_utf8_validate(cleanme, nullptr)) if (validateUtf8(cleanme, nullptr))
{ {
return std::string{ cleanme }; return std::string{ cleanme };
} }

2
libtransmission/utils.h
View File

@@ -94,8 +94,6 @@ template<typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
template<typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true> template<typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
[[nodiscard]] std::optional<T> tr_parseNum(std::string_view& sv); [[nodiscard]] std::optional<T> tr_parseNum(std::string_view& sv);
bool tr_utf8_validate(std::string_view sv, char const** good_end);
#ifdef _WIN32 #ifdef _WIN32
std::string tr_win32_format_message(uint32_t code); std::string tr_win32_format_message(uint32_t code);

10
tests/libtransmission/utils-test.cc
View File

@@ -127,13 +127,13 @@ TEST_F(UtilsTest, trStrvUtf8Clean)
in = "\x92\xE0\xE3\xA4\xAD\xAE \xA1\xEB\xE2\xEC \x81\xAE\xA3\xAE\xAC"sv; in = "\x92\xE0\xE3\xA4\xAD\xAE \xA1\xEB\xE2\xEC \x81\xAE\xA3\xAE\xAC"sv;
out = tr_strvUtf8Clean(in); out = tr_strvUtf8Clean(in);
EXPECT_TRUE(std::size(out) == 17 || std::size(out) == 33); EXPECT_TRUE(std::size(out) == 17 || std::size(out) == 33);
EXPECT_TRUE(tr_utf8_validate(out, nullptr)); EXPECT_EQ(out, tr_strvUtf8Clean(out));
// same string, but utf-8 clean // same string, but utf-8 clean
in = "Трудно быть Богом"sv; in = "Трудно быть Богом"sv;
out = tr_strvUtf8Clean(in); out = tr_strvUtf8Clean(in);
EXPECT_NE(0U, std::size(out)); EXPECT_NE(0U, std::size(out));
EXPECT_TRUE(tr_utf8_validate(out, nullptr)); EXPECT_EQ(out, tr_strvUtf8Clean(out));
EXPECT_EQ(in, out); EXPECT_EQ(in, out);
// https://trac.transmissionbt.com/ticket/6064 // https://trac.transmissionbt.com/ticket/6064
@@ -142,13 +142,13 @@ TEST_F(UtilsTest, trStrvUtf8Clean)
in = "\xF4\x00\x81\x82"sv; in = "\xF4\x00\x81\x82"sv;
out = tr_strvUtf8Clean(in); out = tr_strvUtf8Clean(in);
EXPECT_NE(0U, std::size(out)); EXPECT_NE(0U, std::size(out));
EXPECT_TRUE(tr_utf8_validate(out, nullptr)); EXPECT_EQ(out, tr_strvUtf8Clean(out));
in = "\xF4\x33\x81\x82"sv; in = "\xF4\x33\x81\x82"sv;
out = tr_strvUtf8Clean(in); out = tr_strvUtf8Clean(in);
EXPECT_NE(nullptr, out.data()); EXPECT_NE(nullptr, out.data());
EXPECT_TRUE(out.size() == 4 || out.size() == 7); EXPECT_TRUE(out.size() == 4 || out.size() == 7);
EXPECT_TRUE(tr_utf8_validate(out, nullptr)); EXPECT_EQ(out, tr_strvUtf8Clean(out));
} }
TEST_F(UtilsTest, trStrvUtf8CleanFuzz) TEST_F(UtilsTest, trStrvUtf8CleanFuzz)
@@ -159,7 +159,7 @@ TEST_F(UtilsTest, trStrvUtf8CleanFuzz)
buf.resize(tr_rand_int(4096)); buf.resize(tr_rand_int(4096));
tr_rand_buffer(std::data(buf), std::size(buf)); tr_rand_buffer(std::data(buf), std::size(buf));
auto const out = tr_strvUtf8Clean({ std::data(buf), std::size(buf) }); auto const out = tr_strvUtf8Clean({ std::data(buf), std::size(buf) });
EXPECT_TRUE(tr_utf8_validate(out, nullptr)); EXPECT_EQ(out, tr_strvUtf8Clean(out));
} }
} }