Browse Source

made method signature consistent with lib/cc/session.h.
I believe this is sufficiently trivial, so committing it without an explicit review.


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@2419 e5f2f494-b856-4b98-b285-d166d9295462

JINMEI Tatuya 15 years ago
parent
commit
3cfa66a9a2
2 changed files with 9 additions and 10 deletions
  1. 3 4
      src/lib/config/tests/fake_session.cc
  2. 6 6
      src/lib/config/tests/fake_session.h

+ 3 - 4
src/lib/config/tests/fake_session.cc

@@ -90,8 +90,7 @@ getFirstMessage(std::string& group, std::string& to)
 }
 }
 
 
 void
 void
-addMessage(ElementPtr msg, const std::string& group, const std::string& to)
+addMessage(ElementPtr msg, const std::string& group, const std::string& to) {
-{
     ElementPtr m_el = Element::createList();
     ElementPtr m_el = Element::createList();
     m_el->add(Element::create(group));
     m_el->add(Element::create(group));
     m_el->add(Element::create(to));
     m_el->add(Element::create(to));
@@ -247,7 +246,7 @@ Session::unsubscribe(std::string group, std::string instance) {
     listRemove(subscriptions, s_el);
     listRemove(subscriptions, s_el);
 }
 }
 
 
-unsigned int
+int
 Session::group_sendmsg(ElementPtr msg, std::string group,
 Session::group_sendmsg(ElementPtr msg, std::string group,
                        std::string to, std::string instance UNUSED_PARAM)
                        std::string to, std::string instance UNUSED_PARAM)
 {
 {
@@ -264,7 +263,7 @@ Session::group_recvmsg(ElementPtr& envelope, ElementPtr& msg,
     return (recvmsg(envelope, msg, nonblock, seq));
     return (recvmsg(envelope, msg, nonblock, seq));
 }
 }
 
 
-unsigned int
+int
 Session::reply(ElementPtr& envelope, ElementPtr& newmsg) {
 Session::reply(ElementPtr& envelope, ElementPtr& newmsg) {
     //cout << "[XX] client sends reply: " << newmsg << endl;
     //cout << "[XX] client sends reply: " << newmsg << endl;
     //cout << "[XX] env: " << envelope << endl;
     //cout << "[XX] env: " << envelope << endl;

+ 6 - 6
src/lib/config/tests/fake_session.h

@@ -86,16 +86,16 @@ namespace isc {
                            std::string instance = "*");
                            std::string instance = "*");
             void unsubscribe(std::string group,
             void unsubscribe(std::string group,
                              std::string instance = "*");
                              std::string instance = "*");
-            unsigned int group_sendmsg(isc::data::ElementPtr msg,
+            int group_sendmsg(isc::data::ElementPtr msg,
-                                       std::string group,
+                              std::string group,
-                                       std::string instance = "*",
+                              std::string instance = "*",
-                                       std::string to = "*");
+                              std::string to = "*");
             bool group_recvmsg(isc::data::ElementPtr& envelope,
             bool group_recvmsg(isc::data::ElementPtr& envelope,
                                isc::data::ElementPtr& msg,
                                isc::data::ElementPtr& msg,
                                bool nonblock = true,
                                bool nonblock = true,
                                int seq = -1);
                                int seq = -1);
-            unsigned int reply(isc::data::ElementPtr& envelope,
+            int reply(isc::data::ElementPtr& envelope,
-                               isc::data::ElementPtr& newmsg);
+                      isc::data::ElementPtr& newmsg);
             bool hasQueuedMsgs();
             bool hasQueuedMsgs();
 
 
         };
         };