Place parenthesis surrounding macro parameters so that the use of sread and swrite...

diff --git a/lib/setup.h b/lib/setup.h
index cf7216b..ca822c3 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -246,11 +246,11 @@ typedef unsigned char bool;
   Error: Missing definition of return and arguments types of recv().
   /* */
 #else
-#define sread(x,y,z) (ssize_t)recv((RECV_TYPE_ARG1)x, (RECV_TYPE_ARG2)y, (RECV_TYPE_ARG3)z, (RECV_TYPE_ARG4)SEND_4TH_ARG)
+#define sread(x,y,z) (ssize_t)recv((RECV_TYPE_ARG1)(x), (RECV_TYPE_ARG2)(y), (RECV_TYPE_ARG3)(z), (RECV_TYPE_ARG4)(SEND_4TH_ARG))
 #endif
 #else /* HAVE_RECV */
 #ifdef DJGPP
-#define sread(x,y,z) (ssize_t)read_s((int)x, (char *)y, (int)z)
+#define sread(x,y,z) (ssize_t)read_s((int)(x), (char *)(y), (int)(z))
 #endif 
 #endif /* HAVE_RECV */
 
@@ -265,11 +265,11 @@ typedef unsigned char bool;
   Error: Missing definition of return and arguments types of send().
   /* */
 #else
-#define swrite(x,y,z) (ssize_t)send((SEND_TYPE_ARG1)x, (SEND_TYPE_ARG2)y, (SEND_TYPE_ARG3)z, (SEND_TYPE_ARG4)SEND_4TH_ARG)
+#define swrite(x,y,z) (ssize_t)send((SEND_TYPE_ARG1)(x), (SEND_TYPE_ARG2)(y), (SEND_TYPE_ARG3)(z), (SEND_TYPE_ARG4)(SEND_4TH_ARG))
 #endif
 #else /* HAVE_SEND */
 #ifdef DJGPP
-#define swrite(x,y,z) (ssize_t)write_s((int)x, (char *)y, (int)z)
+#define swrite(x,y,z) (ssize_t)write_s((int)(x), (char *)(y), (int)(z))
 #endif 
 #endif /* HAVE_SEND */
 

diff --git a/tests/server/sws.c b/tests/server/sws.c
index 7cc0e1c..7d1b76e 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -454,7 +454,7 @@ static int get_request(int sock, struct httprequest *req)
   /*** end of httprequest init ***/
 
   while (req->offset < REQBUFSIZ) {
-    ssize_t got = sread(sock, (reqbuf + req->offset), (REQBUFSIZ - req->offset));
+    ssize_t got = sread(sock, reqbuf + req->offset, REQBUFSIZ - req->offset);
     if (got <= 0) {
       if (got < 0) {
         logmsg("recv() returned error: %d", errno);