Commit 9df37b93 authored by Yang Tse's avatar Yang Tse
Browse files

juggle() actually returns bool. 

Remove redundant and unreachable log message.
parent 7b5c8603

tests/server/sockfilt.c

+5 −11
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ enum sockmode { 
  if sockfd is CURL_SOCKET_BAD, listendfd is a listening socket we must

  accept()

*/

static int juggle(curl_socket_t *sockfdp,

static bool juggle(curl_socket_t *sockfdp,

                   curl_socket_t listenfd,

                   enum sockmode *mode)

{
@@ -308,18 +308,12 @@ static int juggle(curl_socket_t *sockfdp, 


        buffer_len = (ssize_t)strtol((char *)buffer, NULL, 16);

        if (buffer_len > (ssize_t)sizeof(buffer)) {

          logmsg("Buffer size %d too small for data size %d", 

                   (int)sizeof(buffer), buffer_len);

          logmsg("ERROR: Buffer size (%ld bytes) too small for data size "

                 "(%ld bytes)", (long)sizeof(buffer), (long)buffer_len);

          return FALSE;

        }

        logmsg("> %d bytes data, server => client", buffer_len);



        if(buffer_len > (ssize_t)sizeof(buffer)) {

          logmsg("ERROR: %d bytes of data does not fit within the %d "

                 "bytes buffer", buffer_len, sizeof(buffer));

          return FALSE;

        }



        /*

         * To properly support huge data chunks, we need to repeat the call

         * to read() until we're done or it fails.