Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

EAP_ERROR replaced with C++ exceptions for increased code readability

Browse Source
This commit is contained in:
Simon Rozman
2016-08-08 22:59:17 +02:00
parent 788c8cdb16
commit b71e30f642
33 changed files with 1180 additions and 2001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/EAPBase_UI/include/EAP_UI.h
View File

@@ -429,14 +429,12 @@ protected:
{
if (!m_target.empty() && m_is_config) {
// Read credentials from Credential Manager
EAP_ERROR *pEapError;
if (!m_cred.retrieve(m_target.c_str(), &pEapError)) {
if (pEapError) {
if (pEapError->dwWinError != ERROR_NOT_FOUND)
wxLogError(winstd::tstring_printf(_("Error reading credentials from Credential Manager: %ls (error %u)"), pEapError->pRootCauseString, pEapError->dwWinError).c_str());
m_cred.m_module.free_error_memory(pEapError);
} else
wxLogError(_("Reading credentials failed."));
try {
m_cred.retrieve(m_target.c_str());
} catch (eap::win_runtime_error &err) {
wxLogError(winstd::tstring_printf(_("Error reading credentials from Credential Manager: %ls (error %u)"), err.m_msg.c_str(), err.m_error).c_str());
} catch (...) {
wxLogError(_("Reading credentials failed."));
}
}
@@ -451,13 +449,12 @@ protected:
if (!m_target.empty()) {
if (m_remember->GetValue()) {
// Write credentials to credential manager.
EAP_ERROR *pEapError;
if (!m_cred.store(m_target.c_str(), &pEapError)) {
if (pEapError) {
wxLogError(winstd::tstring_printf(_("Error writing credentials to Credential Manager: %ls (error %u)"), pEapError->pRootCauseString, pEapError->dwWinError).c_str());
m_cred.m_module.free_error_memory(pEapError);
} else
wxLogError(_("Writing credentials failed."));
try {
m_cred.store(m_target.c_str());
} catch (eap::win_runtime_error &err) {
wxLogError(winstd::tstring_printf(_("Error writing credentials to Credential Manager: %ls (error %u)"), err.m_msg.c_str(), err.m_error).c_str());
} catch (...) {
wxLogError(_("Writing credentials failed."));
}
}
}