memory leak fixes

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

diff --git a/src/plpbus/BusMessage.hh b/src/plpbus/BusMessage.hh
index 855a39937b2b3269796e6280d2b5b9629918cc49..3a2cd093cd083118a3845fe5d7ef4fada2459ea3 100644 (file)
--- a/src/plpbus/BusMessage.hh
+++ b/src/plpbus/BusMessage.hh
@@ -8,22 +8,34 @@
 #ifndef BUSMESSAGE_H_
 #define BUSMESSAGE_H_
 
-#define CONST_MSG_ID_KEY_NAME  "_msgid"
+#include <string>
+
+#include "RequestResponseBus.hh"
+
+using namespace plpbus_orb;
 
 namespace plpbus {
        class BusMessage
        {
                public:
-                       void    *_dataItemSeq;
+                       DataItemSequence        *_dataItemSeq;
 
                        BusMessage(long type_param);
                        BusMessage(long type_param, const char *arg_name_param, const char *arg_string_value_param);
                        virtual ~BusMessage();
-                       int add_string_parameter(const char *arg_name_param, const char *string_value_param);
-                       int add_long_parameter(const char *arg_name_param, long value_param);
-                       int add_int_parameter(const char *arg_name_param, int value_param);
-                       int add_double_parameter(const char *arg_name_param, double value_param);
-                       int add_float_parameter(const char *arg_name_param, float value_param);
+                       int add_cstring_parameter(const char *arg_name_param, const char *value_param);
+                       int add_string_parameter(std::string arg_name_param, std::string value_param);
+                       int add_long_parameter(std::string arg_name_param, long value_param);
+                       int add_int_parameter(std::string arg_name_param, int value_param);
+                       int add_double_parameter(std::string arg_name_param, double value_param);
+                       int add_float_parameter(std::string arg_name_param, float value_param);
+                       long get_type(int *err_flg);
+                       std::string get_string_parameter(std::string arg_name_param, int *err_flg);
+                       long get_long_parameter(std::string arg_name_param, int *err_flg);
+                       int get_int_parameter(std::string arg_name_param, int *err_flg);
+                       double get_double_parameter(std::string arg_name_param, int *err_flg);
+                       float get_float_parameter(std::string arg_name_param, int *err_flg);
+                       unsigned long get_parameter_count();
                        void printout();
                protected:
                        BusMessage();