diff --git a/.clang-format b/.clang-format index fcb28b7e..cb2bd10c 100644 --- a/.clang-format +++ b/.clang-format @@ -89,10 +89,6 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Left -RawStringFormats: - - Delimiter: pb - Language: TextProto - BasedOnStyle: google ReflowComments: true SortIncludes: false SortUsingDeclarations: true diff --git a/src/Platform.cc b/src/Platform.cc index d7882a97..93d795ff 100644 --- a/src/Platform.cc +++ b/src/Platform.cc @@ -112,14 +112,14 @@ bool Platform::setUp() #endif // ENABLE_NLS #ifdef HAVE_OPENSSL -#if !OPENSSL_101_API +# if !OPENSSL_101_API // for SSL initialization SSL_load_error_strings(); SSL_library_init(); // Need this to "decrypt" p12 files. OpenSSL_add_all_algorithms(); -#endif // !OPENSSL_101_API -#endif // HAVE_OPENSSL +# endif // !OPENSSL_101_API +#endif // HAVE_OPENSSL #ifdef HAVE_LIBGCRYPT if (!gcry_check_version("1.2.4")) { throw DL_ABORT_EX("gcry_check_version() failed."); diff --git a/src/main.cc b/src/main.cc index 1d4d24dd..f14cea6a 100644 --- a/src/main.cc +++ b/src/main.cc @@ -62,7 +62,7 @@ error_code::Value main(int argc, char** argv) } std::vector> winArgStrs; winArgStrs.reserve(winArgc); - auto pargv = make_unique(winArgc); + auto pargv = make_unique(winArgc); for (int i = 0; i < winArgc; ++i) { winArgStrs.emplace_back(strdup(wCharToUtf8(winArgv[i]).c_str())); pargv[i] = winArgStrs.back().get();