From d37348ee06000d5e21dec290db339d8a4b0ab5d0 Mon Sep 17 00:00:00 2001 From: Vasili Galka Date: Tue, 13 Mar 2018 14:46:39 +0200 Subject: [PATCH] Code style adjustment --- include/fmt/format.cc | 18 ++++++++---------- test/util-test.cc | 16 ++++++++-------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/include/fmt/format.cc b/include/fmt/format.cc index 6da96f71..0eddaf8c 100644 --- a/include/fmt/format.cc +++ b/include/fmt/format.cc @@ -283,11 +283,10 @@ FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s) { if (s.size() > INT_MAX || s.data() == nullptr) FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG)); int s_size = static_cast(s.size()); - if (s_size == 0) // MultiByteToWideChar does not support zero length, handle separately - { - buffer_.resize(1); - buffer_[0] = 0; - return; + if (s_size == 0) { // MultiByteToWideChar does not support zero length, handle separately + buffer_.resize(1); + buffer_[0] = 0; + return; } 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) return ERROR_INVALID_PARAMETER; int s_size = static_cast(s.size()); - if (s_size == 0) // MultiByteToWideChar does not support zero length, handle separately - { - buffer_.resize(1); - buffer_[0] = 0; - return 0; + if (s_size == 0) { // MultiByteToWideChar does not support zero length, handle separately + buffer_.resize(1); + buffer_[0] = 0; + return 0; } int length = WideCharToMultiByte( diff --git a/test/util-test.cc b/test/util-test.cc index 5073dcf7..11957655 100644 --- a/test/util-test.cc +++ b/test/util-test.cc @@ -666,10 +666,10 @@ TEST(UtilTest, UTF16ToUTF8) { } TEST(UtilTest, UTF16ToUTF8EmptyString) { - std::string s = ""; - fmt::internal::utf16_to_utf8 u(L""); - EXPECT_EQ(s, u.str()); - EXPECT_EQ(s.size(), u.size()); + std::string s = ""; + fmt::internal::utf16_to_utf8 u(L""); + EXPECT_EQ(s, u.str()); + EXPECT_EQ(s.size(), u.size()); } TEST(UtilTest, UTF8ToUTF16) { @@ -680,10 +680,10 @@ TEST(UtilTest, UTF8ToUTF16) { } TEST(UtilTest, UTF8ToUTF16EmptyString) { - std::string s = ""; - fmt::internal::utf8_to_utf16 u(s.c_str()); - EXPECT_EQ(L"", u.str()); - EXPECT_EQ(s.size(), u.size()); + std::string s = ""; + fmt::internal::utf8_to_utf16 u(s.c_str()); + EXPECT_EQ(L"", u.str()); + EXPECT_EQ(s.size(), u.size()); } template