[#2454] Renamed ctrl socket template to appease doxygen

diff --git a/src/bin/netconf/control_socket.cc b/src/bin/netconf/control_socket.cc
index 5b18cd23e4186de7f5ea9c8f21e4d14e1581c704..6e3c75a18b5aeeb4ae98374470b560121e560529 100644 (file)
--- a/src/bin/netconf/control_socket.cc
+++ b/src/bin/netconf/control_socket.cc
@@ -20,7 +20,7 @@ namespace isc {
 namespace netconf {
 
 ControlSocketBasePtr
-createControlSocket(CfgControlSocketPtr ctrl_sock) {
+controlSocketFactory(CfgControlSocketPtr ctrl_sock) {
     if (!ctrl_sock) {
         isc_throw(BadValue, "null control socket configuration");
     }

diff --git a/src/bin/netconf/control_socket.h b/src/bin/netconf/control_socket.h
index a075cb73aed0101c15fb422d854333dacbc32aeb..080be9f3c8c3a70bc7615eb86cb99d7c2a025f30 100644 (file)
--- a/src/bin/netconf/control_socket.h
+++ b/src/bin/netconf/control_socket.h
@@ -112,7 +112,7 @@ typedef boost::shared_ptr<ControlSocketBase> ControlSocketBasePtr;
 /// @param ctrl_sock The control socket configuration.
 /// @return A pointer to a control socket communication object.
 /// @throw NotImplemented if no specialization was called.
-template <CfgControlSocket::Type TYPE>  ControlSocketBasePtr
+template <CfgControlSocket::Type TYPE> ControlSocketBasePtr
 createControlSocket(CfgControlSocketPtr ctrl_sock) {
     isc_throw(NotImplemented, "not specialized createControlSocket");
 }
@@ -123,7 +123,7 @@ createControlSocket(CfgControlSocketPtr ctrl_sock) {
 /// @return A pointer to a control socket communication object.
 /// @throw BadValue if called with null or an unknown type.
 ControlSocketBasePtr
-createControlSocket(CfgControlSocketPtr ctrl_sock);
+controlSocketFactory(CfgControlSocketPtr ctrl_sock);
 
 } // namespace netconf
 } // namespace isc

diff --git a/src/bin/netconf/netconf.cc b/src/bin/netconf/netconf.cc
index 93866467b3959b769a73737d5e477a0482dbbe24..d179a875d6585f1fe949a765bd758e9326ff9b1a 100644 (file)
--- a/src/bin/netconf/netconf.cc
+++ b/src/bin/netconf/netconf.cc
@@ -202,7 +202,7 @@ NetconfAgent::keaConfig(const CfgServersMapPair& service_pair) {
     }
     ControlSocketBasePtr comm;
     try {
-        comm = createControlSocket(ctrl_sock);
+        comm = controlSocketFactory(ctrl_sock);
     } catch (const std::exception& ex) {
         ostringstream msg;
         msg << "createControlSocket failed with " << ex.what();
@@ -395,7 +395,7 @@ NetconfAgent::yangConfig(const CfgServersMapPair& service_pair) {
     }
     ControlSocketBasePtr comm;
     try {
-        comm = createControlSocket(ctrl_sock);
+        comm = controlSocketFactory(ctrl_sock);
     } catch (const std::exception& ex) {
         ostringstream msg;
         msg << "control socket creation failed with " << ex.what();
@@ -556,7 +556,7 @@ NetconfAgent::change(S_Session sess, const CfgServersMapPair& service_pair) {
     }
     ControlSocketBasePtr comm;
     try {
-        comm = createControlSocket(ctrl_sock);
+        comm = controlSocketFactory(ctrl_sock);
     } catch (const std::exception& ex) {
         ostringstream msg;
         msg << "createControlSocket failed with " << ex.what();
@@ -642,7 +642,7 @@ NetconfAgent::done(S_Session sess, const CfgServersMapPair& service_pair) {
     // the server.
     ControlSocketBasePtr comm;
     try {
-        comm = createControlSocket(ctrl_sock);
+        comm = controlSocketFactory(ctrl_sock);
     } catch (const std::exception& ex) {
         ostringstream msg;
         msg << "createControlSocket failed with " << ex.what();