X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fplpbus%2FBusMessage.cc;h=1fbc724064dbf6fcb33070c6ce87319788d1503c;hb=8d8f86ae288245111e80196ea1b03aca6e4febc3;hp=6da32de0d0edb9a3ce1d0e9a2e87c10dbf5dada2;hpb=827ba77fe55e4587ef605068ab092216cfffad2c;p=libplpbus.git

diff --git a/src/plpbus/BusMessage.cc b/src/plpbus/BusMessage.cc
index 6da32de..1fbc724 100644
--- a/src/plpbus/BusMessage.cc
+++ b/src/plpbus/BusMessage.cc
@@ -40,23 +40,11 @@ BusMessage::BusMessage(long type_param,
 }
 
 BusMessage::~BusMessage() {
-	long			cnt;
 	DataItemSequence	*seq;
 
-	log_debug("BusMessage DESTRUCTOR\n");
+	log_debug("\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);
 	}
 }
@@ -214,6 +202,7 @@ long BusMessage::get_type(int *err_flg) {
 	long	ret_val;
 	long	res;
 
+	ret_val	= -1;
 	res	= get_long_parameter(CONST_MSG_ID_KEY_NAME, err_flg);
 	if (*err_flg == PLP_OK) {
 		ret_val	= res;
@@ -244,6 +233,7 @@ long BusMessage::get_long_parameter(string arg_name_param, int *err_flg) {
 	DataItem		*item;
 	DataItemSequence	*seq;
 
+	ret_val		= 0;
 	*err_flg	= PLP_ERR_DATA_NOT_FOUND;
 	seq		= (DataItemSequence *)_dataItemSeq;
 	item		= get_dataitem_by_param_name(seq, arg_name_param);
@@ -260,6 +250,7 @@ int BusMessage::get_int_parameter(string arg_name_param, int *err_flg) {
 	DataItemSequence	*seq;
 	long			tmp;
 
+	ret_val		= 0;
 	*err_flg	= PLP_ERR_DATA_NOT_FOUND;
 	seq		= (DataItemSequence *)_dataItemSeq;
 	item		= get_dataitem_by_param_name(seq, arg_name_param);
@@ -276,6 +267,7 @@ double BusMessage::get_double_parameter(string arg_name_param, int *err_flg) {
 	DataItem	*item;
 	DataItemSequence *seq;
 
+	ret_val		= 0;
 	*err_flg	= PLP_ERR_DATA_NOT_FOUND;
 	seq		= (DataItemSequence *)_dataItemSeq;
 	item		= get_dataitem_by_param_name(seq, arg_name_param);
@@ -291,6 +283,7 @@ float BusMessage::get_float_parameter(string arg_name_param, int *err_flg) {
 	DataItem	*item;
 	DataItemSequence *seq;
 
+	ret_val		= 0;
 	*err_flg	= PLP_ERR_DATA_NOT_FOUND;
 	seq		= (DataItemSequence *)_dataItemSeq;
 	item		= get_dataitem_by_param_name(seq, arg_name_param);
@@ -301,6 +294,15 @@ float BusMessage::get_float_parameter(string arg_name_param, int *err_flg) {
 	return ret_val;
 }
 
+unsigned long BusMessage::get_parameter_count() {
+	int			ret_val;
+	DataItemSequence	*seq;
+
+	seq	= (DataItemSequence *)_dataItemSeq;
+	ret_val	= seq->length();
+	return ret_val;
+}
+
 void BusMessage::printout_dataitem(long index, void *item) {
 	CORBA::TCKind	kind;
 	const char 	*name;
@@ -364,7 +366,6 @@ 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);
 	}