some updates, new tests

3 files changed, 13 insertions, 12 deletions

diff --git a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp
index 20308cd..2e359fb 100644
--- a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp
+++ b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp
@@ -370,7 +370,7 @@ DBusHandlerResult CommandReceiverShadow::receiveCallback(DBusConnection *conn, D
 	assert(msg!=NULL);
 	assert(user_data!=NULL);
 	CommandReceiverShadow* reference=(CommandReceiverShadow*) user_data;
-	return reference->receiveCallbackDelegate(conn,msg);
+	return (reference->receiveCallbackDelegate(conn,msg));
 }
 
 void CommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessage *msg)
@@ -412,7 +412,7 @@ DBusHandlerResult CommandReceiverShadow::receiveCallbackDelegate(DBusConnection
 
 	if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) {
 		sendIntrospection(conn,msg);
-		return DBUS_HANDLER_RESULT_HANDLED;
+		return (DBUS_HANDLER_RESULT_HANDLED);
 	}
 
 	functionMap_t::iterator iter = mFunctionMap.begin();
@@ -423,10 +423,10 @@ DBusHandlerResult CommandReceiverShadow::receiveCallbackDelegate(DBusConnection
     	std::string p(iter->first);
     	CallBackMethod cb=iter->second;
     	(this->*cb)(conn,msg);
-    	return DBUS_HANDLER_RESULT_HANDLED;
+    	return (DBUS_HANDLER_RESULT_HANDLED);
     }
 
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 }
 
 void CommandReceiverShadow::setCommandReceiver(CommandReceiveInterface*& receiver)
@@ -468,7 +468,7 @@ CommandReceiverShadow::functionMap_t CommandReceiverShadow::createMap()
 	m["GetListSystemProperties"]=&CommandReceiverShadow::getListSystemProperties ;
 	m["GetTimingInformation"]=&CommandReceiverShadow::getTimingInformation ;
 	m["SetSystemProperty"]=&CommandReceiverShadow::setSystemProperty ;
-	return m;
+	return (m);
 }
 
 
diff --git a/PluginCommandInterfaceDbus/src/CommandSender.cpp b/PluginCommandInterfaceDbus/src/CommandSender.cpp
index 5b087cd..7b7f8ae 100644
--- a/PluginCommandInterfaceDbus/src/CommandSender.cpp
+++ b/PluginCommandInterfaceDbus/src/CommandSender.cpp
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <set>
 
-DLT_DECLARE_CONTEXT(DBusCommandPlugin);
+DLT_DECLARE_CONTEXT(DBusCommandPlugin)
 
 /**
  * factory for plugin loading
@@ -66,6 +66,7 @@ DbusCommandSender::DbusCommandSender()
 DbusCommandSender::~DbusCommandSender()
 {
 	DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("DbusCommandSender destructed"));
+	DLT_UNREGISTER_CONTEXT(DBusCommandPlugin);
 }
 
 am_Error_e DbusCommandSender::startupInterface(CommandReceiveInterface* commandreceiveinterface)
@@ -76,7 +77,7 @@ am_Error_e DbusCommandSender::startupInterface(CommandReceiveInterface* commandr
 	mCommandReceiverShadow.setCommandReceiver(mCommandReceiveInterface);
 	mCommandReceiveInterface->getDBusConnectionWrapper(mDBusWrapper);
 	assert(mDBusWrapper!=NULL);
-	return E_OK;
+	return (E_OK);
 }
 
 
@@ -87,7 +88,7 @@ am_Error_e DbusCommandSender::stopInterface()
 	/**
 	 * todo: finish DbusCommandSender::stopInterface(), what needs to be done?
 	 */
-	return E_OK;
+	return(E_OK);
 }
 
 
diff --git a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp
index 4133355..21c1350 100644
--- a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp
+++ b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp
@@ -139,9 +139,9 @@ dbus_uint16_t DBusMessageHandler::getUInt()
 
     if (DBUS_TYPE_UINT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter))
     {
-    	DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBusMessageHandler::getUInt DBUS handler argument is no uint32_t!"));
+    	DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBusMessageHandler::getUInt DBUS handler argument is no uint16_t!"));
     	mErrorName=std::string(DBUS_ERROR_INVALID_ARGS);
-    	mErrorMsg="DBus argument is no uint32_t";
+    	mErrorMsg="DBus argument is no uint16_t";
     }
     else
     {
@@ -157,9 +157,9 @@ dbus_int16_t DBusMessageHandler::getInt()
 
     if (DBUS_TYPE_INT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter))
     {
-    	DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBusMessageHandler::getInt DBUS handler argument is no int32_t!"));
+    	DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBusMessageHandler::getInt DBUS handler argument is no int16_t!"));
     	mErrorName=std::string(DBUS_ERROR_INVALID_ARGS);
-    	mErrorMsg="DBus argument is no int32_t";;
+    	mErrorMsg="DBus argument is no int16_t";
     }
     else
     {