nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: not necessary c_str() removed.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/baseloop.cpp
+5 -5
View File
@@ -48,7 +48,7 @@ void BaseLoop::start()
// send result to client // send result to client
result += '\n'; result += '\n';
Connection* connection = static_cast<Connection*>(message->getSource()); Connection* connection = static_cast<Connection*>(message->getSource());
connection->addResult(Message(result.c_str())); connection->addResult(Message(result));
delete message; delete message;
} }
@@ -98,7 +98,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
if (busCommand->getResult().c_str()[0] != '-') { if (busCommand->getResult().c_str()[0] != '-') {
// decode data // 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 // return result
result << command->calcResult(cmd); result << command->calcResult(cmd);
@@ -106,7 +106,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
delete command; delete command;
} else { } else {
L.log(bas, error, " %s", busCommand->getResult().c_str()); 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 { } else {
L.log(bas, error, " %s", busCommand->getResult().c_str()); L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult().c_str(); result << busCommand->getResult();
} }
delete busCommand; delete busCommand;
@@ -184,7 +184,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
cycdata = m_cycdata->getData(index); cycdata = m_cycdata->getData(index);
if (cycdata != "") { if (cycdata != "") {
// decode data // decode data
Command* command = new Command(index, (*m_commands)[index], cycdata.c_str()); Command* command = new Command(index, (*m_commands)[index], cycdata);
// return result // return result
result << command->calcResult(cmd); result << command->calcResult(cmd);
src/baseloop.h
+1 -1
View File
@@ -37,7 +37,7 @@ public:
Message(const std::string data, void* source = NULL) : m_data(data), m_source(source) {} 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) {} 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; } void* getSource() const { return m_source; }
private: private:
utils/logger.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ void LogInstance::log(const Area area, const Level level, const std::string& dat
if (vasprintf(&tmp, data.c_str(), ap) != -1) { if (vasprintf(&tmp, data.c_str(), ap) != -1) {
std::string buffer(tmp); std::string buffer(tmp);
m_messages.add(new LogMessage(LogMessage(area, level, buffer.c_str(), LogMessage::Run))); m_messages.add(new LogMessage(LogMessage(area, level, buffer, LogMessage::Run)));
} }
va_end(ap); va_end(ap);