remove old comment, fix returncodes on signal

[enigma2.git] / lib / network / socket.cpp

diff --git a/lib/network/socket.cpp b/lib/network/socket.cpp
index 9de0ca0a86cbbe6d222425518d53491f761785a5..b2ab7437642568a520391f7ae0846cd766471d97 100644 (file)
--- a/lib/network/socket.cpp
+++ b/lib/network/socket.cpp
@@ -43,16 +43,16 @@ void eSocket::inject(const char *data, int len)
                readyRead_();
 }
 
-eString eSocket::readLine()
+std::string eSocket::readLine()
 {
        int size=readbuffer.searchchr('\n');
        if (size == -1)
-               return eString();
+               return std::string();
        size++; // ich will auch das \n
        char buffer[size+1];
        buffer[size]=0;
        readbuffer.read(buffer, size);
-       return eString(buffer);
+       return std::string(buffer);
 }
 
 bool eSocket::canReadLine()
@@ -225,7 +225,7 @@ int eSocket::getDescriptor()
        return socketdesc;
 }
 
-int eSocket::connectToHost(eString hostname, int port)
+int eSocket::connectToHost(std::string hostname, int port)
 {
        struct hostent *server;
        int res;
@@ -269,6 +269,7 @@ int eSocket::connectToHost(eString hostname, int port)
 
 eSocket::eSocket(eMainloop *ml): readbuffer(32768), writebuffer(32768), rsn(0)
 {
+       ASSERT(ml);
        int s=socket(AF_INET, SOCK_STREAM, 0);
 #if 0
        eDebug("[SOCKET]: initalized socket %d", socketdesc);