From 64634605b3ccb90d582cfdf380535c89bf900a0e Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@fastmq.commkdir>
Date: Sat, 21 Nov 2009 21:13:29 +0100
Subject: obsolete parameter removed from 'bind' command

---
 src/command.hpp     | 1 -
 src/object.cpp      | 9 +++------
 src/object.hpp      | 6 +++---
 src/session.cpp     | 2 +-
 src/socket_base.cpp | 6 ++----
 src/socket_base.hpp | 3 +--
 6 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/command.hpp b/src/command.hpp
index 9a2e5d5..a31805b 100644
--- a/src/command.hpp
+++ b/src/command.hpp
@@ -70,7 +70,6 @@ namespace zmq
 
             //  Sent from session to socket to establish pipe(s) between them.
             struct {
-                class owned_t *session;
                 class reader_t *in_pipe;
                 class writer_t *out_pipe;
             } bind;
diff --git a/src/object.cpp b/src/object.cpp
index d24e477..6b05380 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -83,8 +83,7 @@ void zmq::object_t::process_command (command_t &cmd_)
         return;
 
     case command_t::bind:
-        process_bind (cmd_.args.bind.session,
-            cmd_.args.bind.in_pipe, cmd_.args.bind.out_pipe);
+        process_bind (cmd_.args.bind.in_pipe, cmd_.args.bind.out_pipe);
         return;
 
     case command_t::pipe_term:
@@ -183,13 +182,12 @@ void zmq::object_t::send_attach (session_t *destination_, i_engine *engine_)
     send_command (cmd);
 }
 
-void zmq::object_t::send_bind (object_t *destination_, owned_t *session_,
+void zmq::object_t::send_bind (object_t *destination_,
     reader_t *in_pipe_, writer_t *out_pipe_)
 {
     command_t cmd;
     cmd.destination = destination_;
     cmd.type = command_t::bind;
-    cmd.args.bind.session = session_;
     cmd.args.bind.in_pipe = in_pipe_;
     cmd.args.bind.out_pipe = out_pipe_;
     send_command (cmd);
@@ -265,8 +263,7 @@ void zmq::object_t::process_attach (i_engine *engine_)
     zmq_assert (false);
 }
 
-void zmq::object_t::process_bind (owned_t *session_,
-    reader_t *in_pipe_, writer_t *out_pipe_)
+void zmq::object_t::process_bind (reader_t *in_pipe_, writer_t *out_pipe_)
 {
     zmq_assert (false);
 }
diff --git a/src/object.hpp b/src/object.hpp
index 6331372..2f6c0c4 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -68,7 +68,7 @@ namespace zmq
             class owned_t *object_);
         void send_attach (class session_t *destination_,
             struct i_engine *engine_);
-        void send_bind (object_t *destination_, class owned_t *session_,
+        void send_bind (object_t *destination_,
             class reader_t *in_pipe_, class writer_t *out_pipe_);
         void send_revive (class object_t *destination_);
         void send_pipe_term (class writer_t *destination_);
@@ -84,8 +84,8 @@ namespace zmq
         virtual void process_plug ();
         virtual void process_own (class owned_t *object_);
         virtual void process_attach (struct i_engine *engine_);
-        virtual void process_bind (class owned_t *session_,
-            class reader_t *in_pipe_, class writer_t *out_pipe_);
+        virtual void process_bind (class reader_t *in_pipe_,
+            class writer_t *out_pipe_);
         virtual void process_revive ();
         virtual void process_pipe_term ();
         virtual void process_pipe_term_ack ();
diff --git a/src/session.cpp b/src/session.cpp
index eb0a963..388437b 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -155,7 +155,7 @@ void zmq::session_t::process_plug ()
             out_pipe->set_endpoint (this);
         }
 
-        send_bind (owner, this, outbound ? &outbound->reader : NULL,
+        send_bind (owner, outbound ? &outbound->reader : NULL,
             inbound ? &inbound->writer : NULL);
     }
 
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 86e1205..e242e05 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -160,8 +160,7 @@ int zmq::socket_base_t::connect (const char *addr_)
         //  Attach the pipes to the peer socket. Note that peer's seqnum
         //  was incremented in find_endpoint function. When this command
         //  is delivered, peer will consider the seqnum to be processed.
-        //  TODO: Seems that 'session' parameter is unused...
-        send_bind (peer, NULL, out_pipe ? &out_pipe->reader : NULL,
+        send_bind (peer, out_pipe ? &out_pipe->reader : NULL,
             in_pipe ? &in_pipe->writer : NULL);
 
         return 0;
@@ -510,8 +509,7 @@ void zmq::socket_base_t::process_own (owned_t *object_)
     io_objects.insert (object_);
 }
 
-void zmq::socket_base_t::process_bind (owned_t *session_,
-    reader_t *in_pipe_, writer_t *out_pipe_)
+void zmq::socket_base_t::process_bind (reader_t *in_pipe_, writer_t *out_pipe_)
 {
     attach_pipes (in_pipe_, out_pipe_);
 }
diff --git a/src/socket_base.hpp b/src/socket_base.hpp
index b6df8c4..c766bda 100644
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -114,8 +114,7 @@ namespace zmq
 
         //  Handlers for incoming commands.
         void process_own (class owned_t *object_);
-        void process_bind (class owned_t *session_,
-            class reader_t *in_pipe_, class writer_t *out_pipe_);
+        void process_bind (class reader_t *in_pipe_, class writer_t *out_pipe_);
         void process_term_req (class owned_t *object_);
         void process_term_ack ();
 
-- 
cgit v1.2.3