diff options
Diffstat (limited to 'PluginCommandInterfaceDbus/DbusSend.cpp')
| -rw-r--r-- | PluginCommandInterfaceDbus/DbusSend.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/PluginCommandInterfaceDbus/DbusSend.cpp b/PluginCommandInterfaceDbus/DbusSend.cpp index 7183a95..0fa1e19 100644 --- a/PluginCommandInterfaceDbus/DbusSend.cpp +++ b/PluginCommandInterfaceDbus/DbusSend.cpp @@ -10,7 +10,7 @@ DbusSend::DbusSend (DBusConnection* conn, const char* bus_name,const char* path, const char* interface, const char* method) : m_conn(conn) { m_msg=dbus_message_new_method_call(bus_name,path,interface,method); if (NULL == m_msg) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Error while creating DBus message")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Error while creating DBus message")); this->~DbusSend(); } } @@ -22,7 +22,7 @@ DbusSend::~DbusSend() { void DbusSend::appendString(char* string) { dbus_message_iter_init_append(m_msg, &m_args); if (!dbus_message_iter_append_basic(&m_args, DBUS_TYPE_STRING, string)) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); this->~DbusSend(); } } @@ -30,7 +30,7 @@ void DbusSend::appendString(char* string) { void DbusSend::appendInteger(int integer) { dbus_message_iter_init_append(m_msg, &m_args); if (!dbus_message_iter_append_basic(&m_args, DBUS_TYPE_INT32, &integer)) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); this->~DbusSend(); } @@ -41,12 +41,12 @@ void DbusSend::sendReply(bool* reply) { DBusPendingCall* pending; DBusMessageIter args; if (!dbus_connection_send_with_reply (m_conn, m_msg, &pending, -1)) { // -1 is default timeout - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); this->~DbusSend(); } if (NULL == pending) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Pending Call Null")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Pending Call Null")); this->~DbusSend(); } dbus_connection_flush(m_conn); @@ -56,16 +56,16 @@ void DbusSend::sendReply(bool* reply) { DBusMessage* msg=dbus_pending_call_steal_reply(pending); if (NULL == msg) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("DBUS reply NULL")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("DBUS reply NULL")); this->~DbusSend(); } dbus_pending_call_unref(pending); if (!dbus_message_iter_init(msg, &args)) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("DBUS Message without arguments")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("DBUS Message without arguments")); } else if (DBUS_TYPE_BOOLEAN != dbus_message_iter_get_arg_type(&args)) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Argument not boolean")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Argument not boolean")); } else { dbus_message_iter_get_basic(&args, reply); } @@ -78,12 +78,12 @@ void DbusSend::sendReply(int* reply) { DBusPendingCall* pending; DBusMessageIter args; if (!dbus_connection_send_with_reply (m_conn, m_msg, &pending, -1)) { // -1 is default timeout - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Out of memory")); this->~DbusSend(); } if (NULL == pending) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Pending Call Null")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Pending Call Null")); this->~DbusSend(); } dbus_connection_flush(m_conn); @@ -93,16 +93,16 @@ void DbusSend::sendReply(int* reply) { DBusMessage* msg=dbus_pending_call_steal_reply(pending); if (NULL == msg) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("DBUS reply NULL")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("DBUS reply NULL")); this->~DbusSend(); } dbus_pending_call_unref(pending); if (!dbus_message_iter_init(msg, &args)) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("DBUS Message without arguments")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("DBUS Message without arguments")); } else if (DBUS_TYPE_INT32 != dbus_message_iter_get_arg_type(&args)) { - DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("Argument not integer")); + DLT_LOG(DBusCommandPlugin, DLT_LOG_INFO, DLT_STRING("Argument not integer")); } else { dbus_message_iter_get_basic(&args, reply); } |