summaryrefslogtreecommitdiffhomepage
path: root/windows
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-01-31 13:11:42 +0100
committerDavid Lönnhager <david.l@mullvad.net>2020-02-03 09:13:29 +0100
commite16413a0bca49930051998b24bfb224fc59a0422 (patch)
tree7db75bb4e356626511c483f83698f5d7299a2dda /windows
parent0b1204a5ead8ed3aa78f7528276a4c5a89ffc3bc (diff)
downloadmullvadvpn-e16413a0bca49930051998b24bfb224fc59a0422.tar.xz
mullvadvpn-e16413a0bca49930051998b24bfb224fc59a0422.zip
Use driverlogic process in installer
Diffstat (limited to 'windows')
-rw-r--r--windows/driverlogic/src/driverlogic.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/windows/driverlogic/src/driverlogic.cpp b/windows/driverlogic/src/driverlogic.cpp
index 9805954079..16704b6c2b 100644
--- a/windows/driverlogic/src/driverlogic.cpp
+++ b/windows/driverlogic/src/driverlogic.cpp
@@ -62,7 +62,7 @@ void LogAdapters(const std::wstring &description, const std::set<NetworkAdapter>
<< L" Guid: " << adapter.guid << L'\n'
<< L" Name: " << adapter.name << L'\n'
<< L" Alias: " << adapter.alias << L'\n'
- << L" Alias: " << adapter.deviceInstanceId
+ << L" Device instance ID: " << adapter.deviceInstanceId
<< std::endl;
}
}
@@ -333,7 +333,7 @@ std::set<NetworkAdapter> GetTapAdapters(const std::wstring &tapHardwareId)
//
std::cerr << "Skipping TAP adapter due to exception caught while iterating: "
- << e.what();
+ << e.what() << std::endl;
}
}
@@ -442,7 +442,7 @@ ATTEMPT_UPDATE:
//
std::wcout << L"TAP driver update complete. Reboot required: "
- << rebootRequired << std::endl;
+ << rebootRequired;
}
std::optional<NetworkAdapter> FindMullvadAdapter(const std::set<NetworkAdapter> &tapAdapters)
@@ -680,12 +680,12 @@ int wmain(int argc, const wchar_t * argv[], const wchar_t * [])
}
catch (const std::exception &e)
{
- std::cerr << e.what() << std::endl;
+ std::cerr << e.what();
return GENERAL_ERROR;
}
catch (...)
{
- std::wcerr << L"Unhandled exception." << std::endl;
+ std::wcerr << L"Unhandled exception.";
return GENERAL_ERROR;
}
return GENERAL_SUCCESS;