From: Tomek Mrugalski <tomek@isc.org>
Date: Wed, 20 Jul 2022 07:49:10 +0000 (+0200)
Subject: [#2454] Renamed ctrl socket template to appease doxygen
X-Git-Tag: Kea-2.2.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acfae81f6dcc335ad8ba13f5d99ca4b565a8abba;p=thirdparty%2Fkea.git

[#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 5b18cd23e4..6e3c75a18b 100644
--- 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 a075cb73ae..080be9f3c8 100644
--- 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 93866467b3..d179a875d6 100644
--- 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();