git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
graphmultiepg: fix crash when press red on channel without epg
[enigma2.git]
/
lib
/
network
/
socket.cpp
diff --git
a/lib/network/socket.cpp
b/lib/network/socket.cpp
index 9de0ca0a86cbbe6d222425518d53491f761785a5..162ead81a62b4aabed1f22e2be66a202a34bb25d 100644
(file)
--- a/
lib/network/socket.cpp
+++ b/
lib/network/socket.cpp
@@
-10,7
+10,6
@@
void eSocket::close()
if (writebuffer.empty())
{
int wasconnected=(mystate==Connection) || (mystate==Closing);
if (writebuffer.empty())
{
int wasconnected=(mystate==Connection) || (mystate==Closing);
- delete rsn;
rsn=0;
::close(socketdesc);
socketdesc=-1;
rsn=0;
::close(socketdesc);
socketdesc=-1;
@@
-43,16
+42,16
@@
void eSocket::inject(const char *data, int len)
readyRead_();
}
readyRead_();
}
-
eS
tring eSocket::readLine()
+
std::s
tring eSocket::readLine()
{
int size=readbuffer.searchchr('\n');
if (size == -1)
{
int size=readbuffer.searchchr('\n');
if (size == -1)
- return
eS
tring();
+ return
std::s
tring();
size++; // ich will auch das \n
char buffer[size+1];
buffer[size]=0;
readbuffer.read(buffer, size);
size++; // ich will auch das \n
char buffer[size+1];
buffer[size]=0;
readbuffer.read(buffer, size);
- return
eS
tring(buffer);
+ return
std::s
tring(buffer);
}
bool eSocket::canReadLine()
}
bool eSocket::canReadLine()
@@
-87,9
+86,8
@@
int eSocket::setSocket(int s, int iss, eMainloop *ml)
fcntl(socketdesc, F_SETFL, O_NONBLOCK);
last_break = 0xFFFFFFFF;
fcntl(socketdesc, F_SETFL, O_NONBLOCK);
last_break = 0xFFFFFFFF;
- if (rsn)
- delete rsn;
- rsn=new eSocketNotifier(ml, getDescriptor(),
+ rsn = 0;
+ rsn=eSocketNotifier::create(ml, getDescriptor(),
eSocketNotifier::Read|eSocketNotifier::Hungup);
CONNECT(rsn->activated, eSocket::notifier);
return 0;
eSocketNotifier::Read|eSocketNotifier::Hungup);
CONNECT(rsn->activated, eSocket::notifier);
return 0;
@@
-225,7
+223,7
@@
int eSocket::getDescriptor()
return socketdesc;
}
return socketdesc;
}
-int eSocket::connectToHost(
eS
tring hostname, int port)
+int eSocket::connectToHost(
std::s
tring hostname, int port)
{
struct hostent *server;
int res;
{
struct hostent *server;
int res;
@@
-269,6
+267,7
@@
int eSocket::connectToHost(eString hostname, int port)
eSocket::eSocket(eMainloop *ml): readbuffer(32768), writebuffer(32768), rsn(0)
{
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);
int s=socket(AF_INET, SOCK_STREAM, 0);
#if 0
eDebug("[SOCKET]: initalized socket %d", socketdesc);
@@
-277,7
+276,7
@@
eSocket::eSocket(eMainloop *ml): readbuffer(32768), writebuffer(32768), rsn(0)
setSocket(s, 1, ml);
}
setSocket(s, 1, ml);
}
-eSocket::eSocket(int socket, int issocket, eMainloop *ml): readbuffer(32768), writebuffer(32768)
, rsn(0)
+eSocket::eSocket(int socket, int issocket, eMainloop *ml): readbuffer(32768), writebuffer(32768)
{
setSocket(socket, issocket, ml);
mystate=Connection;
{
setSocket(socket, issocket, ml);
mystate=Connection;
@@
-285,8
+284,6
@@
eSocket::eSocket(int socket, int issocket, eMainloop *ml): readbuffer(32768), wr
eSocket::~eSocket()
{
eSocket::~eSocket()
{
- if (rsn)
- delete rsn;
if(socketdesc>=0)
{
::close(socketdesc);
if(socketdesc>=0)
{
::close(socketdesc);