summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-05-11 12:26:26 +0200
committerchristian mueller <christian.ei.mueller@bmw.de>2012-05-24 13:40:22 +0200
commitbdf0b3fd9a91fdd9ef4a7b87af90266884903fa9 (patch)
treeca187bdbe4561400e85d90a173666d532fb4a9a4
parent94db855f41c2013f8ce7adb3c0abd13f8ae02073 (diff)
downloadaudiomanager-bdf0b3fd9a91fdd9ef4a7b87af90266884903fa9.tar.gz
* fix warnings that come with new compiler
Signed-off-by: christian mueller <christian.ei.mueller@bmw.de>
-rw-r--r--AudioManagerDaemon/src/CAmTelnetServer.cpp24
-rw-r--r--AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp2
-rw-r--r--PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp1
-rw-r--r--PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp2
4 files changed, 23 insertions, 6 deletions
diff --git a/AudioManagerDaemon/src/CAmTelnetServer.cpp b/AudioManagerDaemon/src/CAmTelnetServer.cpp
index ed28f9c..b92fad5 100644
--- a/AudioManagerDaemon/src/CAmTelnetServer.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetServer.cpp
@@ -46,8 +46,26 @@ CAmTelnetServer* CAmTelnetServer::mpInstance = NULL;
#define PRINT_BOOL(var) var ? output+="true\t\t" : output+="false\t\t";
CAmTelnetServer::CAmTelnetServer(CAmSocketHandler *iSocketHandler, CAmCommandSender *iCommandSender, CAmCommandReceiver *iCommandReceiver, CAmRoutingSender *iRoutingSender, CAmRoutingReceiver *iRoutingReceiver, CAmControlSender *iControlSender, CAmControlReceiver *iControlReceiver, CAmDatabaseHandler *iDatabasehandler, CAmRouter *iRouter, unsigned int servPort, unsigned int maxConnections) :
- telnetConnectFiredCB(this, &CAmTelnetServer::connectSocket), telnetReceiveFiredCB(this, &CAmTelnetServer::receiveData), telnetDispatchCB(this, &CAmTelnetServer::dispatchData), telnetCheckCB(this, &CAmTelnetServer::check), mpSocketHandler(iSocketHandler), mpCommandSender(iCommandSender), mpCommandReceiver(iCommandReceiver), mpRoutingSender(iRoutingSender), mpRoutingReceiver(iRoutingReceiver), mpControlSender(iControlSender), mpControlReceiver(iControlReceiver), mpDatabasehandler(iDatabasehandler), mpRouter(iRouter), mConnecthandle(), mListMessages(), mListConnections(), mConnectFD(NULL), mServerPort(servPort), mMaxConnections(maxConnections), mTelnetMenuHelper(iSocketHandler, iCommandSender, iCommandReceiver, iRoutingSender, iRoutingReceiver, iControlSender, iControlReceiver,
- iDatabasehandler, iRouter, this)
+ telnetConnectFiredCB(this, &CAmTelnetServer::connectSocket), //
+ telnetReceiveFiredCB(this, &CAmTelnetServer::receiveData), //
+ telnetDispatchCB(this, &CAmTelnetServer::dispatchData), //
+ telnetCheckCB(this, &CAmTelnetServer::check), //
+ mpSocketHandler(iSocketHandler), //
+ mpCommandSender(iCommandSender), //
+ mpCommandReceiver(iCommandReceiver), //
+ mpRoutingSender(iRoutingSender), //
+ mpRoutingReceiver(iRoutingReceiver), //
+ mpControlSender(iControlSender), //
+ mpControlReceiver(iControlReceiver), //
+ mpDatabasehandler(iDatabasehandler), //
+ mpRouter(iRouter), //
+ mConnecthandle(), //
+ mListMessages(), //
+ mListConnections(), //
+ mConnectFD(0), //
+ mServerPort(servPort), //
+ mMaxConnections(maxConnections), //
+ mTelnetMenuHelper(iSocketHandler, iCommandSender, iCommandReceiver, iRoutingSender, iRoutingReceiver, iControlSender, iControlReceiver, iDatabasehandler, iRouter, this)
{
assert(mpSocketHandler!=NULL);
assert(mpCommandReceiver!=NULL);
@@ -152,7 +170,7 @@ void CAmTelnetServer::receiveData(const pollfd pollfd, const sh_pollHandle_t han
//initialize buffer
char buffer[100];
//read until buffer is full or no more data is there
- int read = recv(pollfd.fd, buffer, 100, NULL);
+ int read = recv(pollfd.fd, buffer, 100, 0);
if (read > 1)
{
//read the message and store it in a queue - its a telnet connection so data will be sent on enter !
diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
index d6aec07..09e0ea7 100644
--- a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
@@ -313,7 +313,7 @@ void am::CAmSamplePlugin::receiveData(const pollfd pollfd, const sh_pollHandle_t
//initialize buffer
char buffer[10];
//read until buffer is full or no more data is there
- int read = recv(pollfd.fd, buffer, 7, NULL);
+ int read = recv(pollfd.fd, buffer, 7, 0);
if (read > 1)
{
//read the message and store it in a queue
diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
index 8add391..c952d93 100644
--- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
@@ -16,7 +16,6 @@
*/
#include "CAmCommandSenderDbusTest.h"
-#include <Python.h>
#include <iostream>
#include <fstream>
#include <sstream>
diff --git a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp
index e8c4826..8f3150c 100644
--- a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp
+++ b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp
@@ -469,7 +469,7 @@ am_Gateway_s CAmRoutingDbusMessageHandler::getGatewayData()
{
dbus_message_iter_recurse(&mDBusMessageIter, &arrayIter);
convertion = getBool(arrayIter, false);
- gatewayData.convertionMatrix.push_back(connectionFormat);
+ gatewayData.convertionMatrix.push_back(convertion);
} while (dbus_message_iter_next(&arrayIter));
return (gatewayData);
}