From ca9ec572bd0366c7e137f1873c2def1c283fd51d Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Sun, 1 Apr 2018 21:41:52 +0200 Subject: Rename SOCK_ASSERT to SOCK_MESSAGE SOCK_ASSERT was always called with a true expression ("1") thus only ever executing the message part. Rename the macro, remove the assert part and remove the "1" parameter. --- sockutils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sockutils.c') diff --git a/sockutils.c b/sockutils.c index d768518c..420fd5bc 100644 --- a/sockutils.c +++ b/sockutils.c @@ -848,7 +848,7 @@ int sock_recv(SOCKET sock, void *buffer, size_t size, int flags, if (size == 0) { - SOCK_ASSERT("I have been requested to read zero bytes", 1); + SOCK_MESSAGE("I have been requested to read zero bytes"); return 0; } if (size > INT_MAX) @@ -939,7 +939,7 @@ int sock_recv_dgram(SOCKET sock, void *buffer, size_t size, if (size == 0) { - SOCK_ASSERT("I have been requested to read zero bytes", 1); + SOCK_MESSAGE("I have been requested to read zero bytes"); return 0; } if (size > INT_MAX) @@ -1095,7 +1095,7 @@ int sock_discard(SOCKET sock, int size, char *errbuf, int errbuflen) return -1; } - SOCK_ASSERT("I'm currently discarding data\n", 1); + SOCK_MESSAGE("I'm currently discarding data\n"); return 0; } @@ -1170,7 +1170,7 @@ int sock_check_hostlist(char *hostlist, const char *sep, struct sockaddr_storage if (errbuf) pcap_snprintf(errbuf, errbuflen, "getaddrinfo() %s", gai_strerror(retval)); - SOCK_ASSERT(errbuf, 1); + SOCK_MESSAGE(errbuf); /* Get next token */ token = pcap_strtok_r(NULL, sep, &lasts); -- cgit v1.2.3