small cleanups for error handling and memory leaks

[libplpbus.git] / src / plpbus / BusClient.hh

diff --git a/src/plpbus/BusClient.hh b/src/plpbus/BusClient.hh
index a1fe5dce6cd1dd8eb2ceab0fe0ef3470fdf8262b..32ab7ad9166cc7c64d3a5ae4e75d6e52f370cd31 100644 (file)
--- a/src/plpbus/BusClient.hh
+++ b/src/plpbus/BusClient.hh
@@ -11,9 +11,9 @@
 #include <iostream>
 #include <omniORB4/CORBA.h>
 
+
 #include "RequestResponseBus.hh"
 #include "IClientListener.hh"
-#include "ClientServerCommon.hh"
 #include "BusMessage.hh"
 
 namespace plpbus {
@@ -25,8 +25,8 @@ namespace plpbus {
                        virtual int add_client_listener(IClientListener *listener_param);
                        virtual int send_message_and_request_response(const char *msg_req_param);
                        virtual int send_message_and_wait_response(const char *msg_req_param, char **msg_rsp_param);
-                       virtual int send_message_and_request_response(BusMessage *msg_req_param);
-                       virtual int send_message_and_wait_response(BusMessage *msg_req_param, BusMessage **msg_rsp_param);
+                       virtual int send_message_and_request_response(const BusMessage *msg_req_param);
+                       virtual int send_message_and_wait_response(const BusMessage *msg_req_param, BusMessage **msg_rsp_param);
                        virtual void request_shutdown();
                private:
                        PortableServer::POA_var         _poa;
@@ -35,7 +35,7 @@ namespace plpbus {
                        plpbus_orb::OrbClient_var       _client;
 
                        PortableServer::POA_var create_poa(CORBA::ORB_var orb);
-                       CosNaming::NamingContext_var get_name_service_context(CORBA::ORB_var orb_param);
+                       CosNaming::NamingContext_var get_name_service_context(CORBA::ORB_var orb_param, const char *nameservice_name);
                        /**
                         * Finds server object by it's name by using following keywords:
                         * name[0].id   = (const char *)CONST_LEAF_CONTEXT_NAME__PLPBUS;