memdebug: use send/recv signature for curl_dosend/curl_dorecv

This avoids build errors and warnings caused by implicit casts.

Closes https://github.com/curl/curl/pull/2031

diff --git a/lib/memdebug.c b/lib/memdebug.c
index 8e61aba711244107b6fcd4e80678e5a859a52f5c..2b81c26a6f609ae191ac94288539a01d02ee22e6 100644 (file)
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -356,29 +356,32 @@ curl_socket_t curl_socket(int domain, int type, int protocol,
   return sockfd;
 }
 
-ssize_t curl_dosend(int sockfd, const void *buf, size_t len, int flags,
-                    int line, const char *source)
+SEND_TYPE_RETV curl_dosend(SEND_TYPE_ARG1 sockfd,
+                           SEND_QUAL_ARG2 SEND_TYPE_ARG2 buf,
+                           SEND_TYPE_ARG3 len, SEND_TYPE_ARG4 flags, int line,
+                           const char *source)
 {
-  ssize_t rc;
+  SEND_TYPE_RETV rc;
   if(countcheck("send", line, source))
     return -1;
   rc = send(sockfd, buf, len, flags);
   if(source)
-    curl_memlog("SEND %s:%d send(%zu) = %zd\n",
-                source, line, len, rc);
+    curl_memlog("SEND %s:%d send(%lu) = %ld\n",
+                source, line, (unsigned long)len, (long)rc);
   return rc;
 }
 
-ssize_t curl_dorecv(int sockfd, void *buf, size_t len, int flags,
-                    int line, const char *source)
+RECV_TYPE_RETV curl_dorecv(RECV_TYPE_ARG1 sockfd, RECV_TYPE_ARG2 buf,
+                           RECV_TYPE_ARG3 len, RECV_TYPE_ARG4 flags, int line,
+                           const char *source)
 {
-  ssize_t rc;
+  RECV_TYPE_RETV rc;
   if(countcheck("recv", line, source))
     return -1;
   rc = recv(sockfd, buf, len, flags);
   if(source)
-    curl_memlog("RECV %s:%d recv(%zu) = %zd\n",
-                source, line, len, rc);
+    curl_memlog("RECV %s:%d recv(%lu) = %ld\n",
+                source, line, (unsigned long)len, (long)rc);
   return rc;
 }
 

diff --git a/lib/memdebug.h b/lib/memdebug.h
index c6b9225f4db7e4e49e52675fb32b6b93b74ffb80..6fb8b6851111fe26712b6e74dda1ba49ebcda78c 100644 (file)
--- a/lib/memdebug.h
+++ b/lib/memdebug.h
@@ -67,10 +67,15 @@ CURL_EXTERN int curl_socketpair(int domain, int type, int protocol,
 #endif
 
 /* send/receive sockets */
-CURL_EXTERN ssize_t curl_dosend(int sockfd, const void *buf, size_t len,
-                                int flags, int line, const char *source);
-CURL_EXTERN ssize_t curl_dorecv(int sockfd, void *buf, size_t len, int flags,
-                                int line, const char *source);
+CURL_EXTERN SEND_TYPE_RETV curl_dosend(SEND_TYPE_ARG1 sockfd,
+                                       SEND_QUAL_ARG2 SEND_TYPE_ARG2 buf,
+                                       SEND_TYPE_ARG3 len,
+                                       SEND_TYPE_ARG4 flags, int line,
+                                       const char *source);
+CURL_EXTERN RECV_TYPE_RETV curl_dorecv(RECV_TYPE_ARG1 sockfd,
+                                       RECV_TYPE_ARG2 buf, RECV_TYPE_ARG3 len,
+                                       RECV_TYPE_ARG4 flags, int line,
+                                       const char *source);
 
 /* FILE functions */
 CURL_EXTERN FILE *curl_fopen(const char *file, const char *mode, int line,