generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-14 02:57:45 +01:00
Code Issues Projects Releases Wiki Activity

giving up on strerror_r

Browse Source
This commit is contained in:
Guenter Obiltschnig 2016-09-08 10:12:54 +02:00
parent ed88e8d46d
commit 909c06ac6c
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Net/src/Socket.cpp
View File

@ -150,9 +150,7 @@ int Socket::select(SocketList& readList, SocketList& writeList, SocketList& exce
epollfd = epoll_create(epollSize); epollfd = epoll_create(epollSize);
if (epollfd < 0) if (epollfd < 0)
{ {
char buf[1024]; SocketImpl::error("Can't create epoll queue");
(void) strerror_r(errno, buf, sizeof(buf));
SocketImpl::error(std::string("Can't create epoll queue: ") + buf);
} }
for (struct epoll_event* e = eventsIn; e != eventLast; ++e) for (struct epoll_event* e = eventsIn; e != eventLast; ++e)
@ -162,10 +160,8 @@ int Socket::select(SocketList& readList, SocketList& writeList, SocketList& exce
{ {
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, e) < 0) if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, e) < 0)
{ {
char buf[1024];
(void) strerror_r(errno, buf, sizeof(buf));
::close(epollfd); ::close(epollfd);
SocketImpl::error(std::string("Can't insert socket to epoll queue: ") + buf); SocketImpl::error("Can't insert socket to epoll queue");
} }
} }
} }

8
Net/src/SocketImpl.cpp
View File

@ -402,9 +402,7 @@ bool SocketImpl::poll(const Poco::Timespan& timeout, int mode)
int epollfd = epoll_create(1); int epollfd = epoll_create(1);
if (epollfd < 0) if (epollfd < 0)
{ {
char buf[1024]; error("Can't create epoll queue");
(void) strerror_r(errno, buf, sizeof(buf));
error(std::string("Can't create epoll queue: ") + buf);
} }
struct epoll_event evin; struct epoll_event evin;
@ -419,10 +417,8 @@ bool SocketImpl::poll(const Poco::Timespan& timeout, int mode)
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, &evin) < 0) if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, &evin) < 0)
{ {
char buf[1024];
(void) strerror_r(errno, buf, sizeof(buf));
::close(epollfd); ::close(epollfd);
error(std::string("Can't insert socket to epoll queue: ") + buf); error("Can't insert socket to epoll queue");
} }
Poco::Timespan remainingTime(timeout); Poco::Timespan remainingTime(timeout);