authenticatable -> authenticator

2 files changed, 22 insertions, 21 deletions

diff --git a/src/Netrc.cc b/src/Netrc.cc
index e2959835..a30e8485 100644
--- a/src/Netrc.cc
+++ b/src/Netrc.cc
@@ -39,7 +39,7 @@
 
 void Netrc::parse(const string& path)
 {
-  authenticatables.clear();
+  authenticators.clear();
   ifstream f(path.c_str());
   
   if(!f) {
@@ -56,11 +56,11 @@ void Netrc::parse(const string& path)
     }
     pair<string, string> nameValuePair = Util::split(line, "\r\n\t ");
     if(nameValuePair.first == "machine") {
-      storeAuthenticatable(authenticator);
+      storeAuthenticator(authenticator);
       authenticator = new Authenticator();
       authenticator->setMachine(nameValuePair.second);
     } else if(nameValuePair.first == "default") {
-      storeAuthenticatable(authenticator);
+      storeAuthenticator(authenticator);
       authenticator = new DefaultAuthenticator();
     } else {
       if(authenticator.isNull()) {
@@ -75,13 +75,13 @@ void Netrc::parse(const string& path)
       }
     }
   }
-  storeAuthenticatable(authenticator);
+  storeAuthenticator(authenticator);
 }
 
-void Netrc::storeAuthenticatable(const AuthenticatableHandle& authenticatable)
+void Netrc::storeAuthenticator(const AuthenticatorHandle& authenticator)
 {
-  if(!authenticatable.isNull()) {
-    authenticatables.push_back(authenticatable);
+  if(!authenticator.isNull()) {
+    authenticators.push_back(authenticator);
   }
 }
 
@@ -91,18 +91,18 @@ private:
 public:
   AuthHostMatch(const string& hostname):hostname(hostname) {}
 
-  bool operator()(const AuthenticatableHandle& authenticatable)
+  bool operator()(const AuthenticatorHandle& authenticator)
   {
-    return authenticatable->match(hostname);
+    return authenticator->match(hostname);
   }
 };
 
-AuthenticatableHandle Netrc::findAuthenticatable(const string& hostname) const
+AuthenticatorHandle Netrc::findAuthenticator(const string& hostname) const
 {
-  Authenticatables::const_iterator itr =
-    find_if(authenticatables.begin(), authenticatables.end(),
+  Authenticators::const_iterator itr =
+    find_if(authenticators.begin(), authenticators.end(),
 	    AuthHostMatch(hostname));
-  if(itr == authenticatables.end()) {
+  if(itr == authenticators.end()) {
     return 0;
   } else {
     return *itr;
diff --git a/src/Netrc.h b/src/Netrc.h
index 45a8ab02..b36599eb 100644
--- a/src/Netrc.h
+++ b/src/Netrc.h
@@ -45,7 +45,6 @@ public:
 };
 
 typedef SharedHandle<Authenticatable> AuthenticatableHandle;
-typedef deque<AuthenticatableHandle> Authenticatables;
 
 class Authenticator : public Authenticatable {
 private:
@@ -102,6 +101,7 @@ public:
 };
 
 typedef SharedHandle<Authenticator> AuthenticatorHandle;
+typedef deque<AuthenticatorHandle> Authenticators;
 
 class DefaultAuthenticator : public Authenticator {
 public:
@@ -124,27 +124,28 @@ typedef SharedHandle<DefaultAuthenticator> DefaultAuthenticatorHandle;
 
 class Netrc {
 private:
-  Authenticatables authenticatables;
+  Authenticators authenticators;
 
-  void storeAuthenticatable(const AuthenticatableHandle& authenticatable);
+  void storeAuthenticator(const AuthenticatorHandle& authenticator);
 public:
   Netrc() {}
 
   void parse(const string& path);
 
-  AuthenticatableHandle findAuthenticatable(const string& hostname) const;
+  AuthenticatorHandle findAuthenticator(const string& hostname) const;
 
-  const Authenticatables& getAuthenticatables() const
+  const Authenticators& getAuthenticators() const
   {
-    return authenticatables;
+    return authenticators;
   }
 
-  void addAuthenticatable(const AuthenticatableHandle& authenticatable)
+  void addAuthenticator(const AuthenticatorHandle& authenticator)
   {
-    authenticatables.push_back(authenticatable);
+    authenticators.push_back(authenticator);
   }
 };
 
 typedef SharedHandle<Netrc> NetrcHandle;
+typedef SingletonHolder<NetrcHandle> NetrcSingletonHolder;
 
 #endif // _D_NETRC_H_