X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.cc;h=bc8ea9caf21923dd77cdb2897f91116240ca2fe6;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=5ee1afedab6e322d55c76ce5df352c24121254b1;hpb=9f0a32a3d569a0c35f2553e4648afa97f1dade58;p=senf.git diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc index 5ee1afe..bc8ea9c 100644 --- a/Socket/FileHandle.cc +++ b/Socket/FileHandle.cc @@ -111,7 +111,7 @@ prefix_ void senf::FileBody::blocking(bool status) /* We don't take POLLIN/POLLOUT as argument to avoid having to include sys/poll.h in the .cci file (and therefore indirectly into the .hh and then every file which uses FileHandle) */ -prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block, bool oob) +prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, int timeout, bool oob) const { struct ::pollfd pfd; @@ -120,7 +120,7 @@ prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block, bool o pfd.events = incoming?(oob?POLLPRI:POLLIN):POLLOUT; int rv = -1; do { - rv = ::poll(&pfd,1,block?-1:0); + rv = ::poll(&pfd,1,timeout); if (rv<0) switch (errno) { case EINTR: