Merge branch 'master' into random-webseeding

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main.cc b/src/main.cc
index c0aeb4af..dcd4bca0 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -56,25 +56,25 @@ error_code::Value main(int argc, char** argv)
 #ifdef __MINGW32__
   int winArgc;
   auto winArgv = CommandLineToArgvW(GetCommandLineW(), &winArgc);
-  if(winArgv == nullptr) {
+  if (winArgv == nullptr) {
     A2_LOG_ERROR("Reading command-line failed");
     return error_code::UNKNOWN_ERROR;
   }
   std::vector<std::unique_ptr<char>> winArgStrs;
   winArgStrs.reserve(winArgc);
-  auto pargv = make_unique<char*[]>(winArgc);
-  for(int i = 0; i < winArgc; ++i) {
+  auto pargv = make_unique<char* []>(winArgc);
+  for (int i = 0; i < winArgc; ++i) {
     winArgStrs.emplace_back(strdup(wCharToUtf8(winArgv[i]).c_str()));
     pargv[i] = winArgStrs.back().get();
   }
 
   Context context(true, winArgc, pargv.get(), KeyVals());
-#else // !__MINGW32__
+#else  // !__MINGW32__
   Context context(true, argc, argv, KeyVals());
 #endif // !__MINGW32__
 
   error_code::Value exitStatus = error_code::FINISHED;
-  if(context.reqinfo) {
+  if (context.reqinfo) {
     exitStatus = context.reqinfo->execute();
   }
   return exitStatus;
@@ -89,9 +89,9 @@ int main(int argc, char** argv)
   try {
     aria2::Platform platform;
     r = aria2::main(argc, argv);
-  } catch(aria2::Exception& ex) {
-    aria2::global::cerr()->printf("%s\n%s\n",
-                                  EX_EXCEPTION_CAUGHT,
+  }
+  catch (aria2::Exception& ex) {
+    aria2::global::cerr()->printf("%s\n%s\n", EX_EXCEPTION_CAUGHT,
                                   ex.stackTrace().c_str());
     r = ex.getErrorCode();
   }