[checkmk-commits] read/write/send/recv/etc. return ssize_t.

Module: check_mk Branch: master Commit: 93b191958d38e8b9fcdfce0663562480f25fe919 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93b191958d38e8… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Wed Oct 28 10:29:53 2015 +0100 read/write/send/recv/etc. return ssize_t. --- agents/windows/check_mk_agent.cc | 2 +- livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/unixcat.c | 8 +++++--- mkeventd/lib/check_mkevents.cc | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 6c833f4..7e9a5ba 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3335,7 +3335,7 @@ void output(SOCKET &out, const char *format, ...) if (do_tcp) { while (write_to_socket && !g_should_terminate) { - int result = send(out, outbuffer, len, 0); + ssize_t result = send(out, outbuffer, len, 0); if (result == SOCKET_ERROR) { debug("send() failed"); int error = WSAGetLastError(); diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index b876313..9220914 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -86,7 +86,7 @@ char *HostFileColumn::getBlob(void *data, int *size) return 0; } - int read_bytes = read(fd, buffer, *size); + ssize_t read_bytes = read(fd, buffer, *size); close(fd); if (read_bytes != *size) { logger(LG_WARN, "Cannot read %d from %s", *size, path); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 1456ecb..86fb5bb 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -298,7 +298,7 @@ char *Logfile::readIntoBuffer(int *size) return 0; } - int r = read(fd, buffer + 1, *size); + ssize_t r = read(fd, buffer + 1, *size); if (r < 0) { logger(LOG_WARNING, "Cannot read %d bytes from %s: %s", *size, _path, strerror(errno)); free(buffer); diff --git a/livestatus/src/unixcat.c b/livestatus/src/unixcat.c index ac67647..15e5e2d 100644 --- a/livestatus/src/unixcat.c +++ b/livestatus/src/unixcat.c @@ -27,6 +27,7 @@ #include <sys/stat.h> #include <sys/un.h> #include <errno.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -60,7 +61,7 @@ struct thread_info }; -int read_with_timeout(int from, char *buffer, int size, int us) +ssize_t read_with_timeout(int from, char *buffer, int size, int us) { fd_set fds; FD_ZERO(&fds); @@ -106,11 +107,12 @@ void *copy_thread(void *info) } char *write_pos = buffer; while (r) { - int w = write(to, write_pos, r); + ssize_t w = write(to, write_pos, r); if (w > 0) r -= w; else if (w == 0 && r > 0) { - fprintf(stderr, "Error: Cannot write %d bytes to %d: %s\n", w, to, strerror(errno)); + fprintf(stderr, "Error: Cannot write %" PRIdMAX " bytes to %d: %s\n", + (intmax_t)w, to, strerror(errno)); break; } } diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index c9bcfeb..67a8b01 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -213,13 +213,14 @@ int main(int argc, char** argv) } // Send message - int length = write(sock, query_message.c_str(), query_message.length()); + ssize_t length = write(sock, query_message.c_str(), query_message.length()); + (void)length; // Make GCC happy // Get response char response_chunk[4096]; memset(response_chunk, 0, sizeof(response_chunk)); stringstream response_stream; - int read_length; + ssize_t read_length; while (0 < (read_length = read(sock, response_chunk, sizeof(response_chunk)))) { // replace binary 0 in response with space