Module: check_mk
Branch: master
Commit: 0de3da2951546eed3c50dcf1751c40c612f8c495
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0de3da2951546e…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Jul 11 10:08:29 2017 +0200
Encapsulate select() calls, part 2
Mechanical refactoring: Remove unused exception file descriptor set
parameter, see
https://refactoring.com/catalog/removeParameter.html.
Change-Id: I16d3a4f861a3f78aa5d39678926081b1f3818296
---
livestatus/src/InputBuffer.cc | 2 +-
livestatus/src/OutputBuffer.cc | 2 +-
livestatus/src/Poller.h | 4 ++--
livestatus/src/module.cc | 3 +--
livestatus/src/unixcat.cc | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc
index e2ecae8..1bfd98b 100644
--- a/livestatus/src/InputBuffer.cc
+++ b/livestatus/src/InputBuffer.cc
@@ -212,7 +212,7 @@ InputBuffer::Result InputBuffer::readData() {
FD_SET(_fd, &fds);
timeval tv = to_timeval(milliseconds(200));
- int retval = poller.poll(_fd + 1, &fds, nullptr, nullptr, &tv);
+ int retval = poller.poll(_fd + 1, &fds, nullptr, &tv);
if (retval > 0 && FD_ISSET(_fd, &fds)) {
ssize_t r = read(_fd, &_readahead_buffer[_write_index],
_readahead_buffer.capacity() - _write_index);
diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc
index e44d46b..bf54168 100644
--- a/livestatus/src/OutputBuffer.cc
+++ b/livestatus/src/OutputBuffer.cc
@@ -85,7 +85,7 @@ void OutputBuffer::writeData(ostringstream &os) {
FD_SET(_fd, &fds);
timeval tv = to_timeval(milliseconds(100));
- int retval = poller.poll(_fd + 1, nullptr, &fds, nullptr, &tv);
+ int retval = poller.poll(_fd + 1, nullptr, &fds, &tv);
if (retval > 0 && FD_ISSET(_fd, &fds)) {
ssize_t bytes_written = write(_fd, buffer, bytes_to_write);
if (bytes_written == -1) {
diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h
index 71e2090..7a71451 100644
--- a/livestatus/src/Poller.h
+++ b/livestatus/src/Poller.h
@@ -32,9 +32,9 @@ class Poller {
public:
Poller() {}
- int poll(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+ int poll(int nfds, fd_set *readfds, fd_set *writefds,
struct timeval *timeout) {
- return select(nfds, readfds, writefds, exceptfds, timeout);
+ return select(nfds, readfds, writefds, nullptr, timeout);
}
};
diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc
index 8f0ca4e..05980f7 100644
--- a/livestatus/src/module.cc
+++ b/livestatus/src/module.cc
@@ -207,8 +207,7 @@ void *main_thread(void *data) {
fd_set fds;
FD_ZERO(&fds);
FD_SET(g_unix_socket, &fds);
- int retval =
- poller.poll(g_unix_socket + 1, &fds, nullptr, nullptr, &tv);
+ int retval = poller.poll(g_unix_socket + 1, &fds, nullptr, &tv);
if (retval > 0 && FD_ISSET(g_unix_socket, &fds)) {
int cc = accept(g_unix_socket, nullptr, nullptr);
if (cc > g_max_fd_ever) {
diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc
index f381129..2b4362b 100644
--- a/livestatus/src/unixcat.cc
+++ b/livestatus/src/unixcat.cc
@@ -63,7 +63,7 @@ ssize_t read_with_timeout(int from, char *buffer, int size, int us) {
struct timeval tv;
tv.tv_sec = us / 1000000;
tv.tv_usec = us % 1000000;
- int retval = poller.poll(from + 1, &fds, nullptr, nullptr, &tv);
+ int retval = poller.poll(from + 1, &fds, nullptr, &tv);
if (retval > 0) {
return read(from, buffer, size);
}