From 6689383824fc96cdb9cef7fedbba883ea7de74a5 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 1 Feb 2017 14:32:00 +0100
Subject: [PATCH] Clean-up

---
 lib/EAPBase_UI/src/EAP_UI.cpp | 7 ++++---
 lib/TTLS/src/Module.cpp       | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp
index ef1ffcd..85709fd 100644
--- a/lib/EAPBase_UI/src/EAP_UI.cpp
+++ b/lib/EAPBase_UI/src/EAP_UI.cpp
@@ -445,11 +445,12 @@ wxEAPProviderSelectDialog::wxEAPProviderSelectDialog(eap::config_connection &cfg
     std::unique_ptr<eap::config_method> cfg_dummy(cfg.m_module.make_config_method());
     m_banner->m_title->SetLabel(wxString::Format("%s %s", wxT(PRODUCT_NAME_STR), cfg_dummy->get_method_str()));
 
-    for (auto prov = cfg.m_providers.cbegin(), prov_end = cfg.m_providers.cend(); prov != prov_end; ++prov) {
-        wxCommandLinkButton *btn = new wxCommandLinkButton(this, wxID_ANY, wxEAPGetProviderName(prov->m_name));
+    // Iterate over providers.
+    for (auto cfg_prov = cfg.m_providers.cbegin(), cfg_prov_end = cfg.m_providers.cend(); cfg_prov != cfg_prov_end; ++cfg_prov) {
+        wxCommandLinkButton *btn = new wxCommandLinkButton(this, wxID_ANY, wxEAPGetProviderName(cfg_prov->m_name));
         m_providers->Add(btn, 0, wxALL|wxEXPAND, 5);
 
-        btn->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(wxEAPProviderSelectDialog::OnProvSelect), new wxVariant((void*)&*prov), this);
+        btn->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(wxEAPProviderSelectDialog::OnProvSelect), new wxVariant((void*)&*cfg_prov), this);
     }
 
     this->Layout();
diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp
index 96ed100..5eea20a 100644
--- a/lib/TTLS/src/Module.cpp
+++ b/lib/TTLS/src/Module.cpp
@@ -224,8 +224,8 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session(
     // Unpack credentials.
     unpack(s->m_cred, pUserData, dwUserDataSize);
 
+    // Look-up the provider.
     config_method_ttls *cfg_method;
-
     for (auto cfg_prov = s->m_cfg.m_providers.begin(), cfg_prov_end = s->m_cfg.m_providers.end();; ++cfg_prov) {
         if (cfg_prov != cfg_prov_end) {
             if (s->m_cred.match(*cfg_prov)) {
@@ -436,6 +436,7 @@ const eap::config_method_ttls* eap::peer_ttls::combine_credentials(
     UNREFERENCED_PARAMETER(dwUserDataSize);
 #endif
 
+    // Iterate over providers.
     for (auto cfg_prov = cfg.m_providers.cbegin(), cfg_prov_end = cfg.m_providers.cend(); cfg_prov != cfg_prov_end; ++cfg_prov) {
         wstring target_name(std::move(cfg_prov->get_id()));