optimized

src/tools/ebusctl.cpp

@@ -122,7 +122,7 @@ string fetchData(TCPSocket* socket, bool& listening)
 {
 	char data[1024];
 	ssize_t datalen;
-	ostringstream ss;
+	ostringstream ostream;
 	string message;
 
 	int ret;
@@ -201,14 +201,13 @@ string fetchData(TCPSocket* socket, bool& listening)
 				}
 
 				for (int i = 0; i < datalen; i++)
-						ss << data[i];
+					ostream << data[i];
-
-					if ((ss.str().length() >= 2
-					&& ss.str()[ss.str().length()-2] == '\n'
-					&& ss.str()[ss.str().length()-1] == '\n')
-					|| listening)
-						break;
 
+				string str = ostream.str();
+				if (listening)
+					return str;
+				if (str.length() >= 2 && str[str.length()-2] == '\n' && str[str.length()-1] == '\n')
+					return str;
 			}
 			else
 				break;
@@ -226,10 +225,9 @@ string fetchData(TCPSocket* socket, bool& listening)
 
 			message.clear();
 		}
-
 	}
 
-	return ss.str();
+	return ostream.str();
 }
 
 void connect(const char* host, uint16_t port, char* const *args, int argCount)