git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/dvb/sec.h: use insert instead of splice..
[enigma2.git]
/
lib
/
base
/
message.cpp
diff --git
a/lib/base/message.cpp
b/lib/base/message.cpp
index dafbf3f88c0b9a49988daa365574b7bc379bd822..48fcd21035886d5ccce41f868cffc3aad792cd85 100644
(file)
--- a/
lib/base/message.cpp
+++ b/
lib/base/message.cpp
@@
-17,25
+17,19
@@
eMessagePump::~eMessagePump()
int eMessagePump::send(const void *data, int len)
{
int eMessagePump::send(const void *data, int len)
{
- if (ismt)
- content.lock(len);
- return ::write(fd[1], data, len)<0;
+ int wr = ::write(fd[1], data, len);
+ if (ismt && wr > 0)
+ content.lock(wr);
+ return wr<0;
}
int eMessagePump::recv(void *data, int len)
{
unsigned char*dst=(unsigned char*)data;
}
int eMessagePump::recv(void *data, int len)
{
unsigned char*dst=(unsigned char*)data;
- while (len)
- {
- if (ismt)
- content.unlock(len);
- int r=::read(fd[0], dst, len);
- if (r<0)
- return r;
- dst+=r;
- len-=r;
- }
- return 0;
+ int recv=::read(fd[0], dst, len);
+ if (recv > 0 && ismt)
+ content.unlock(recv);
+ return recv;
}
int eMessagePump::getInputFD() const
}
int eMessagePump::getInputFD() const