Skip to content

Commit b54850b

Browse files
committed
change variable names
1 parent a89d20d commit b54850b

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/aws-cpp-sdk-core/include/aws/core/config/AWSConfigFileProfileConfigLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ namespace Aws
5757
private:
5858
Aws::String m_fileName;
5959
bool m_useProfilePrefix;
60-
Aws::Map<Aws::String, Aws::Map<Aws::String, Aws::String>> m_servicesDefinitions;
60+
Aws::Map<Aws::String, Aws::Map<Aws::String, Aws::String>> m_services;
6161
};
6262
}
6363
}

src/aws-cpp-sdk-core/include/aws/core/config/AWSProfileConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ namespace Aws
9494
return iter->second;
9595
}
9696

97-
inline const Aws::String& GetServicesDefinitionName() const {
97+
inline const Aws::String& GetServicesName() const {
9898
auto iter = m_allKeyValPairs.find("services");
9999
static const Aws::String empty;
100100
return (iter != m_allKeyValPairs.end()) ? iter->second : empty;

src/aws-cpp-sdk-core/source/config/AWSConfigFileProfileConfigLoader.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ namespace Aws
116116
{}
117117

118118
const Aws::Map<String, Profile>& GetProfiles() const { return m_foundProfiles; }
119-
const Aws::Map<String, Aws::Map<String, String>>& GetServicesDefinitions() const { return m_servicesDefinitions; }
119+
const Aws::Map<String, Aws::Map<String, String>>& GetServices() const { return m_services; }
120120

121121
void ParseStream(Aws::IStream& stream)
122122
{
@@ -189,7 +189,7 @@ namespace Aws
189189

190190
// Property inside an active block: "endpoint_url = http://..."
191191
if (!activeServiceId.empty() && left == ENDPOINT_URL_KEY) {
192-
m_servicesDefinitions[currentSectionName][activeServiceId] = right;
192+
m_services[currentSectionName][activeServiceId] = right;
193193
continue;
194194
}
195195
}
@@ -626,7 +626,7 @@ namespace Aws
626626

627627
Aws::Map<String, Profile> m_foundProfiles;
628628
Aws::Map<String, Profile::SsoSession> m_foundSsoSessions;
629-
Aws::Map<String, Aws::Map<String, String>> m_servicesDefinitions;
629+
Aws::Map<String, Aws::Map<String, String>> m_services;
630630
};
631631

632632
static const char* const CONFIG_FILE_LOADER = "Aws::Config::AWSConfigFileProfileConfigLoader";
@@ -641,15 +641,15 @@ namespace Aws
641641
bool AWSConfigFileProfileConfigLoader::LoadInternal()
642642
{
643643
m_profiles.clear();
644-
m_servicesDefinitions.clear();
644+
m_services.clear();
645645

646646
Aws::IFStream inputFile(m_fileName.c_str());
647647
if(inputFile)
648648
{
649649
ConfigFileProfileFSM parser(m_useProfilePrefix);
650650
parser.ParseStream(inputFile);
651651
m_profiles = parser.GetProfiles();
652-
m_servicesDefinitions = parser.GetServicesDefinitions();
652+
m_services = parser.GetServices();
653653
return m_profiles.size() > 0;
654654
}
655655

@@ -746,20 +746,20 @@ namespace Aws
746746
return nullptr;
747747
}
748748

749-
const auto& servicesDefName = profileIter->second.GetServicesDefinitionName();
750-
if (servicesDefName.empty()) {
749+
const auto& servicesName = profileIter->second.GetServicesName();
750+
if (servicesName.empty()) {
751751
return nullptr;
752752
}
753753

754-
auto servicesDefIter = m_servicesDefinitions.find(servicesDefName);
755-
if (servicesDefIter == m_servicesDefinitions.end()) {
754+
auto servicesIter = m_services.find(servicesName);
755+
if (servicesIter == m_services.end()) {
756756
return nullptr;
757757
}
758758

759759
Aws::String key = StringUtils::ToLower(serviceId.c_str());
760760
StringUtils::Replace(key, " ", "_");
761-
auto serviceIter = servicesDefIter->second.find(key);
762-
return (serviceIter == servicesDefIter->second.end()) ? nullptr : &serviceIter->second;
761+
auto serviceIter = servicesIter->second.find(key);
762+
return (serviceIter == servicesIter->second.end()) ? nullptr : &serviceIter->second;
763763
}
764764

765765
const Aws::String* AWSConfigFileProfileConfigLoader::GetGlobalEndpointUrl(const Aws::String& profileName) const

0 commit comments

Comments
 (0)