github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

clang-format-7

pull/1385/head
Tatsuhiro Tsujikawa 2019-04-07 12:49:10 +09:00
parent eb7a15513a
commit 4af4a7cfc3
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.clang-format
View File

@ -89,10 +89,6 @@ PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000 PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60 PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left PointerAlignment: Left
RawStringFormats:
- Delimiter: pb
Language: TextProto
BasedOnStyle: google
ReflowComments: true ReflowComments: true
SortIncludes: false SortIncludes: false
SortUsingDeclarations: true SortUsingDeclarations: true

6
src/Platform.cc
View File

@ -112,14 +112,14 @@ bool Platform::setUp()
#endif // ENABLE_NLS #endif // ENABLE_NLS
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
#if !OPENSSL_101_API # if !OPENSSL_101_API
// for SSL initialization // for SSL initialization
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
// Need this to "decrypt" p12 files. // Need this to "decrypt" p12 files.
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
#endif // !OPENSSL_101_API # endif // !OPENSSL_101_API
#endif // HAVE_OPENSSL #endif // HAVE_OPENSSL
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
if (!gcry_check_version("1.2.4")) { if (!gcry_check_version("1.2.4")) {
throw DL_ABORT_EX("gcry_check_version() failed."); throw DL_ABORT_EX("gcry_check_version() failed.");

2
src/main.cc
View File

@ -62,7 +62,7 @@ error_code::Value main(int argc, char** argv)
} }
std::vector<std::unique_ptr<char>> winArgStrs; std::vector<std::unique_ptr<char>> winArgStrs;
winArgStrs.reserve(winArgc); winArgStrs.reserve(winArgc);
auto pargv = make_unique<char* []>(winArgc); auto pargv = make_unique<char*[]>(winArgc);
for (int i = 0; i < winArgc; ++i) { for (int i = 0; i < winArgc; ++i) {
winArgStrs.emplace_back(strdup(wCharToUtf8(winArgv[i]).c_str())); winArgStrs.emplace_back(strdup(wCharToUtf8(winArgv[i]).c_str()));
pargv[i] = winArgStrs.back().get(); pargv[i] = winArgStrs.back().get();