Memory leak fixes.

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

diff --git a/src/plpbus/BusMessage.cc b/src/plpbus/BusMessage.cc
index 12b35c6b866134a5d47697278bf098fc404c1734..6da32de0d0edb9a3ce1d0e9a2e87c10dbf5dada2 100644 (file)
--- a/src/plpbus/BusMessage.cc
+++ b/src/plpbus/BusMessage.cc
@@ -40,24 +40,64 @@ BusMessage::BusMessage(long type_param,
 }
 
 BusMessage::~BusMessage() {
+       long                    cnt;
+       DataItemSequence        *seq;
+
+       log_debug("BusMessage DESTRUCTOR\n");
+       seq     = (DataItemSequence *)_dataItemSeq;
+       if (seq != NULL) {
+               cnt     = seq->length();
+/*
+               DataItem                *item;
+
+               for (long ii = 0; ii < cnt; ii++) {
+                       item    = seq[ii];
+                       log_debug("deleting BusMessage item:\n");
+                       printout_dataitem(ii, item);
+                       delete(item);
+               }
+*/
+               delete(seq);
+       }
+}
+
+int BusMessage::add_cstring_parameter(const char *arg_name_param, const char *value_param) {
+       long                    ln;
+       int                     ret_val;
+       DataItemSequence        *seq;
+       DataItem                *item;
+
+       ret_val = 0;
+       seq     = (DataItemSequence *)_dataItemSeq;
+       if (arg_name_param != NULL) {
+               ln                      = seq->length();
+               seq->length(ln + 1);
+               item                    = &((*seq)[ln]);
+               item->name              = arg_name_param;
+               item->str_value         = value_param;
+       }
+       else {
+               ret_val = -1;
+       }
+       return ret_val;
 }
 
 int BusMessage::add_string_parameter(string arg_name_param, string value_param)
 {
-       long                    length;
+       long                    ln;
        int                     ret_val;
-       DataItem                *item;
        DataItemSequence        *seq;
+       DataItem                *item;
 
+       //str   = (const char)"hooo";
        ret_val = 0;
        seq     = (DataItemSequence *)_dataItemSeq;
        if (arg_name_param.empty() == false) {
-               length          = seq->length();
-               item            = new DataItem();
-               item->name      = strdup(arg_name_param.c_str());
-               item->value     <<= value_param.c_str();
-               seq->length(length + 1);
-               (*seq)[length]  = *item;
+               ln              = seq->length();
+               seq->length(ln + 1);
+               item            = &((*seq)[ln]);
+               item->name      = arg_name_param.c_str();
+               item->str_value = value_param.c_str();
        }
        else {
                ret_val = -1;
@@ -69,19 +109,16 @@ int BusMessage::add_long_parameter(string arg_name_param, long value_param)
 {
        long                    length;
        int                     ret_val;
-       DataItem                *item;
        DataItemSequence        *seq;
 
        ret_val = 0;
        seq     = (DataItemSequence *)_dataItemSeq;
        if (arg_name_param.empty() == false) {
                length          = seq->length();
-               item            = new DataItem();
-               item->name      = strdup(arg_name_param.c_str());
-               item->value     <<= value_param;
-
                seq->length(length + 1);
-               (*seq)[length]  = *item;
+               (*seq)[length].name     = arg_name_param.c_str();
+               (*seq)[length].value    <<= value_param;
+               (*seq)[length].str_value = "";
        }
        else {
                ret_val = -1;
@@ -93,19 +130,16 @@ int BusMessage::add_int_parameter(string arg_name_param, int value_param)
 {
        long                    length;
        int                     ret_val;
-       DataItem                *item;
        DataItemSequence        *seq;
 
        ret_val = 0;
        seq     = (DataItemSequence *)_dataItemSeq;
        if (arg_name_param.empty() == false) {
                length          = seq->length();
-               item            = new DataItem();
-               item->name      = strdup(arg_name_param.c_str());
-               item->value     <<= (long)value_param;
-
                seq->length(length + 1);
-               (*seq)[length]  = *item;
+               (*seq)[length].name     = arg_name_param.c_str();
+               (*seq)[length].value    <<= (long)value_param;
+               (*seq)[length].str_value = "";
        }
        else {
                ret_val = -1;
@@ -117,7 +151,6 @@ int BusMessage::add_double_parameter(string arg_name_param, double value_param)
 {
        long                    length;
        int                     ret_val;
-       DataItem                *item;
        DataItemSequence        *seq;
 
        ret_val = 0;
@@ -125,12 +158,10 @@ int BusMessage::add_double_parameter(string arg_name_param, double value_param)
        seq     = (DataItemSequence *)_dataItemSeq;
        if (arg_name_param.empty() == false) {
                length          = seq->length();
-               item            = new DataItem();
-               item->name      = strdup(arg_name_param.c_str());
-               item->value     <<= (double)value_param;
-
                seq->length(length + 1);
-               (*seq)[length]  = *item;
+               (*seq)[length].name     = arg_name_param.c_str();
+               (*seq)[length].value    <<= (double)value_param;
+               (*seq)[length].str_value = "";
        }
        else {
                ret_val = -1;
@@ -143,19 +174,16 @@ int BusMessage::add_float_parameter(string arg_name_param, float value_param)
 {
        long                    length;
        int                     ret_val;
-       DataItem                *item;
        DataItemSequence        *seq;
 
        ret_val = 0;
        seq     = (DataItemSequence *)_dataItemSeq;
        if (arg_name_param.empty() == false) {
                length          = seq->length();
-               item            = new DataItem();
-               item->name      = strdup(arg_name_param.c_str());
-               item->value     <<= (float)value_param;
-
                seq->length(length + 1);
-               (*seq)[length]  = *item;
+               (*seq)[length].name     = arg_name_param.c_str();
+               (*seq)[length].value    <<= (float)value_param;
+               (*seq)[length].str_value = "";
        }
        else {
                ret_val = -1;
@@ -203,7 +231,8 @@ string BusMessage::get_string_parameter(string arg_name_param, int *err_flg) {
        seq             = (DataItemSequence *)_dataItemSeq;
        item            = get_dataitem_by_param_name(seq, arg_name_param);
        if (item != NULL) {
-               item->value >>= CORBA::Any::to_string(ch, 0);
+               //item->value >>= CORBA::Any::to_string(ch, 0);
+               ch              = item->str_value;
                ret_val         = ch;
                *err_flg        = PLP_OK;
        }
@@ -283,14 +312,6 @@ void BusMessage::printout_dataitem(long index, void *item) {
                        name    = dataitem->name;
                        kind    = dataitem->value.type()->kind();
                        switch(kind) {
-                               case tk_string:
-                                       {
-                                               const char *val;
-
-                                               dataitem->value >>= val;
-                                               log_debug("\t[%ld] %s: %s\n", index, name, val);
-                                       }
-                                       break;
                                case tk_long:
                                        {
                                                long    val;
@@ -316,6 +337,12 @@ void BusMessage::printout_dataitem(long index, void *item) {
                                        }
                                        break;
                                default:
+                                       {
+                                               const char *val;
+                                               val     = dataitem->str_value;
+                                               log_debug("\t[%ld] %s: %s\n", index, name, val);
+                                       }
+                                       break;
                                        log_error("\t[%ld], name: %s, value unknown\n", index, name);
                        }
                }
@@ -337,6 +364,7 @@ void BusMessage::printout() {
        count   = seq->length();
        log_debug("BusMessage.printout(): parameter count: %ld\n", count);
        for (long ii = 0; ii < count; ii++) {
+               printf("item[%ld]\n", ii);
                item    = (*seq)[ii];
                printout_dataitem(ii, &item);
        }