cleanup: not necessary c_str() removed.

This commit is contained in:
Roland Jax
2014-05-12 17:59:41 +02:00
parent e339511647
commit 2a2b638fc4
3 changed files with 22 additions and 22 deletions
+5 -5
View File
@@ -48,7 +48,7 @@ void BaseLoop::start()
// send result to client
result += '\n';
Connection* connection = static_cast<Connection*>(message->getSource());
connection->addResult(Message(result.c_str()));
connection->addResult(Message(result));
delete message;
}
@@ -98,7 +98,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
if (busCommand->getResult().c_str()[0] != '-') {
// decode data
Command* command = new Command(index, (*m_commands)[index], busCommand->getResult().c_str());
Command* command = new Command(index, (*m_commands)[index], busCommand->getResult());
// return result
result << command->calcResult(cmd);
@@ -106,7 +106,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
delete command;
} else {
L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult().c_str();
result << busCommand->getResult();
}
@@ -159,7 +159,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
} else {
L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult().c_str();
result << busCommand->getResult();
}
delete busCommand;
@@ -184,7 +184,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
cycdata = m_cycdata->getData(index);
if (cycdata != "") {
// decode data
Command* command = new Command(index, (*m_commands)[index], cycdata.c_str());
Command* command = new Command(index, (*m_commands)[index], cycdata);
// return result
result << command->calcResult(cmd);
+4 -4
View File
@@ -37,12 +37,12 @@ public:
Message(const std::string data, void* source = NULL) : m_data(data), m_source(source) {}
Message(const Message& src) : m_data(src.m_data), m_source(src.m_source) {}
std::string getData() const { return m_data.c_str(); }
std::string getData() const { return m_data; }
void* getSource() const { return m_source; }
private:
std::string m_data;
void* m_source;
void* m_source;
};
@@ -52,7 +52,7 @@ class BaseLoop
public:
BaseLoop(EBusLoop* ebusloop, CYCData* cycdata, Commands* commands)
: m_ebusloop(ebusloop), m_cycdata(cycdata), m_commands(commands) {}
void start();
WQueue<Message*>* getQueue() { return &m_queue; }
@@ -64,7 +64,7 @@ private:
Commands* m_commands;
WQueue<Message*> m_queue;
enum ClientCommand {
enum ClientCommand {
get, // get ebus data
set, // set ebus value
cyc, // fetch cycle data