X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fplpbus%2FBusMessage.cc;h=18fc487496a638a4dd00366fd264ad12c7100ac4;hb=15b6554ce37fd29cb507a40e49bbbfe1a438b84b;hp=1743d4c8c807dc82ba7f47898c5f95a81bf15754;hpb=4245d1b8a55a8f461634e94d9bac9e0043a9612b;p=libplpbus.git

diff --git a/src/plpbus/BusMessage.cc b/src/plpbus/BusMessage.cc
index 1743d4c..18fc487 100644
--- a/src/plpbus/BusMessage.cc
+++ b/src/plpbus/BusMessage.cc
@@ -16,33 +16,27 @@ using namespace plpbus;
 using namespace CORBA;
 
 BusMessage::BusMessage() {
-	_dataItemSeq	= new DataItemSequence();
-	log_debug("new BusMessage()\n");
+	_dataItemSeq	= new DataItemSequence(0);
 }
 
-BusMessage::BusMessage(const char *name_param, const char *value_param) {
-	DataItem		*item;
-	DataItemSequence	*seq;
+BusMessage::BusMessage(long type_param) {
+	_dataItemSeq	= new DataItemSequence(0);
 
-	if (name_param != NULL) {
-		item		= new DataItem();
-		item->name	= strdup(name_param);
-		item->value	<<= strdup(value_param);
+	add_long_parameter(CONST_MSG_ID_KEY_NAME, type_param);
+}
 
-		seq	= new DataItemSequence(0);
-		seq->length(1);
-		(*seq)[0]	= *item;
-		_dataItemSeq	= seq;
-	}
-	else {
-		_dataItemSeq	= new DataItemSequence(0);
-	}
+BusMessage::BusMessage(long type_param,
+			const char *arg_name_param,
+			const char *arg_string_value_param) {
+	_dataItemSeq	= new DataItemSequence(0);
+	add_long_parameter(CONST_MSG_ID_KEY_NAME, type_param);
+	add_string_parameter(arg_name_param, arg_string_value_param);
 }
 
 BusMessage::~BusMessage() {
 }
 
-int BusMessage::add_string_parameter(const char *name_param, const char *value_param)
+int BusMessage::add_string_parameter(const char *arg_name_param, const char *value_param)
 {
 	long			length;
 	int			ret_val;
@@ -51,10 +45,10 @@ int BusMessage::add_string_parameter(const char *name_param, const char *value_p
 
 	ret_val	= 0;
 	seq	= (DataItemSequence *)_dataItemSeq;
-	if (name_param != NULL) {
+	if (arg_name_param != NULL) {
 		length		= seq->length();
 		item		= new DataItem();
-		item->name	= strdup(name_param);
+		item->name	= strdup(arg_name_param);
 		if (value_param != NULL) {
 			item->value	<<= strdup(value_param);
 			seq->length(length + 1);
@@ -62,13 +56,12 @@ int BusMessage::add_string_parameter(const char *name_param, const char *value_p
 		}
 	}
 	else {
-		seq->length(0);
 		ret_val	= -1;
 	}
 	return ret_val;
 }
 
-int BusMessage::add_long_parameter(const char *name_param, long value_param)
+int BusMessage::add_long_parameter(const char *arg_name_param, long value_param)
 {
 	long			length;
 	int			ret_val;
@@ -77,23 +70,22 @@ int BusMessage::add_long_parameter(const char *name_param, long value_param)
 
 	ret_val	= 0;
 	seq	= (DataItemSequence *)_dataItemSeq;
-	if (name_param != NULL) {
+	if (arg_name_param != NULL) {
 		length		= seq->length();
 		item		= new DataItem();
-		item->name	= strdup(name_param);
+		item->name	= strdup(arg_name_param);
 		item->value	<<= value_param;
 
 		seq->length(length + 1);
 		(*seq)[length]	= *item;
 	}
 	else {
-		seq->length(0);
 		ret_val	= -1;
 	}
 	return ret_val;
 }
 
-int BusMessage::add_int_parameter(const char *name_param, int value_param)
+int BusMessage::add_int_parameter(const char *arg_name_param, int value_param)
 {
 	long			length;
 	int			ret_val;
@@ -102,23 +94,22 @@ int BusMessage::add_int_parameter(const char *name_param, int value_param)
 
 	ret_val	= 0;
 	seq	= (DataItemSequence *)_dataItemSeq;
-	if (name_param != NULL) {
+	if (arg_name_param != NULL) {
 		length		= seq->length();
 		item		= new DataItem();
-		item->name	= strdup(name_param);
+		item->name	= strdup(arg_name_param);
 		item->value	<<= (long)value_param;
 
 		seq->length(length + 1);
 		(*seq)[length]	= *item;
 	}
 	else {
-		seq->length(0);
 		ret_val	= -1;
 	}
 	return ret_val;
 }
 
-int BusMessage::add_double_parameter(const char *name_param, double value_param)
+int BusMessage::add_double_parameter(const char *arg_name_param, double value_param)
 {
 	long			length;
 	int			ret_val;
@@ -128,24 +119,23 @@ int BusMessage::add_double_parameter(const char *name_param, double value_param)
 	ret_val	= 0;
 	log_debug("add_double_parameter() started\n");
 	seq	= (DataItemSequence *)_dataItemSeq;
-	if (name_param != NULL) {
+	if (arg_name_param != NULL) {
 		length		= seq->length();
 		item		= new DataItem();
-		item->name	= strdup(name_param);
+		item->name	= strdup(arg_name_param);
 		item->value	<<= (long)value_param;
 
 		seq->length(length + 1);
 		(*seq)[length]	= *item;
 	}
 	else {
-		seq->length(0);
 		ret_val	= -1;
 	}
 	log_debug("add_double_parameter() done\n");
 	return ret_val;
 }
 
-int BusMessage::add_float_parameter(const char *name_param, float value_param)
+int BusMessage::add_float_parameter(const char *arg_name_param, float value_param)
 {
 	long			length;
 	int			ret_val;
@@ -154,17 +144,16 @@ int BusMessage::add_float_parameter(const char *name_param, float value_param)
 
 	ret_val	= 0;
 	seq	= (DataItemSequence *)_dataItemSeq;
-	if (name_param != NULL) {
+	if (arg_name_param != NULL) {
 		length		= seq->length();
 		item		= new DataItem();
-		item->name	= strdup(name_param);
+		item->name	= strdup(arg_name_param);
 		item->value	<<= (long)value_param;
 
 		seq->length(length + 1);
 		(*seq)[length]	= *item;
 	}
 	else {
-		seq->length(0);
 		ret_val	= -1;
 	}
 	return ret_val;