cleanup: not necessary c_str() removed.

src/baseloop.cpp

@@ -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);

src/baseloop.h

@@ -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

utils/logger.cpp

@@ -37,10 +37,10 @@ LogMessage::LogMessage(const Area area, const Level level, const std::string tex
 	struct timeval tv;
 	struct timezone tz;
 	struct tm* tm;
-	
+
 	gettimeofday(&tv, &tz);
 	tm = localtime(&tv.tv_sec);
-	
+
 	sprintf(&time[0], "%04d-%02d-%02d %02d:%02d:%02d.%03ld",
 		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
 		tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec/1000);
@@ -65,11 +65,11 @@ void* LogSink::run()
 				while (m_queue.size() == true) {
 					LogMessage* message = m_queue.remove();
 					write(*message);
-					delete message;		
+					delete message;
 				}
 				return NULL;
 			}
-			
+
 		write(*message);
 		delete message;
 	}
@@ -129,7 +129,7 @@ LogInstance& LogInstance::operator+= (LogSink* sink)
 
 	return (*this);
 }
-	
+
 LogInstance& LogInstance::operator-= (const LogSink* sink)
 {
 	sinkCI_t itEnd = m_sinks.end();
@@ -151,12 +151,12 @@ void LogInstance::log(const Area area, const Level level, const std::string& dat
 		char* tmp;
 		va_list ap;
 		va_start(ap, data);
-		
+
 		if (vasprintf(&tmp, data.c_str(), ap) != -1) {
 			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);
 		free(tmp);
 	}
@@ -166,15 +166,15 @@ void LogInstance::log(const Area area, const Level level, const std::string& dat
 void* LogInstance::run()
 {
 	m_running = true;
-	
+
 	while (m_running == true) {
 		LogMessage* message = m_messages.remove();
 
 		sinkCI_t iter = m_sinks.begin();
-		
+
 		for (; iter != m_sinks.end(); ++iter) {
 			if (*iter != 0) {
-			
+
 				if (((*iter)->getAreas() & message->getArea()
 				&& (*iter)->getLevel() >= message->getLevel())
 				&& message->getStatus() == LogMessage::Run) {
@@ -183,10 +183,10 @@ void* LogInstance::run()
 					(*iter)->addMessage(*message);
 					m_running = false;
 				}
-					
+
 			}
 		}
-		
+
 		delete message;
 
 	}