Commit 82728747 authored by Yang Tse's avatar Yang Tse
Browse files

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

Place parenthesis surrounding macro parameters so that the use of sread and swrite is more intuitive.
parent 86f4cead

lib/setup.h

+4 −4
Original line number Diff line number Diff line
@@ -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 */

tests/server/sws.c

+1 −1
Original line number Diff line number Diff line
@@ -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);