External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code style adjustment

Browse Source
This commit is contained in:
Vasili Galka 2018-03-13 14:46:39 +02:00
parent 1c30083936
commit d37348ee06
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/fmt/format.cc
View File

@ -283,11 +283,10 @@ FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s) {
if (s.size() > INT_MAX || s.data() == nullptr) if (s.size() > INT_MAX || s.data() == nullptr)
FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG)); FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG));
int s_size = static_cast<int>(s.size()); int s_size = static_cast<int>(s.size());
if (s_size == 0) // MultiByteToWideChar does not support zero length, handle separately if (s_size == 0) { // MultiByteToWideChar does not support zero length, handle separately
{ buffer_.resize(1);
buffer_.resize(1); buffer_[0] = 0;
buffer_[0] = 0; return;
return;
} }
int length = MultiByteToWideChar( int length = MultiByteToWideChar(
@ -313,11 +312,10 @@ FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s) {
if (s.size() > INT_MAX || s.data() == nullptr) if (s.size() > INT_MAX || s.data() == nullptr)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
int s_size = static_cast<int>(s.size()); int s_size = static_cast<int>(s.size());
if (s_size == 0) // MultiByteToWideChar does not support zero length, handle separately if (s_size == 0) { // MultiByteToWideChar does not support zero length, handle separately
{ buffer_.resize(1);
buffer_.resize(1); buffer_[0] = 0;
buffer_[0] = 0; return 0;
return 0;
} }
int length = WideCharToMultiByte( int length = WideCharToMultiByte(

16
test/util-test.cc
View File

@ -666,10 +666,10 @@ TEST(UtilTest, UTF16ToUTF8) {
} }
TEST(UtilTest, UTF16ToUTF8EmptyString) { TEST(UtilTest, UTF16ToUTF8EmptyString) {
std::string s = ""; std::string s = "";
fmt::internal::utf16_to_utf8 u(L""); fmt::internal::utf16_to_utf8 u(L"");
EXPECT_EQ(s, u.str()); EXPECT_EQ(s, u.str());
EXPECT_EQ(s.size(), u.size()); EXPECT_EQ(s.size(), u.size());
} }
TEST(UtilTest, UTF8ToUTF16) { TEST(UtilTest, UTF8ToUTF16) {
@ -680,10 +680,10 @@ TEST(UtilTest, UTF8ToUTF16) {
} }
TEST(UtilTest, UTF8ToUTF16EmptyString) { TEST(UtilTest, UTF8ToUTF16EmptyString) {
std::string s = ""; std::string s = "";
fmt::internal::utf8_to_utf16 u(s.c_str()); fmt::internal::utf8_to_utf16 u(s.c_str());
EXPECT_EQ(L"", u.str()); EXPECT_EQ(L"", u.str());
EXPECT_EQ(s.size(), u.size()); EXPECT_EQ(s.size(), u.size());
} }
template <typename Converter, typename Char> template <typename Converter, typename Char>