From: Yang Tse <yangsita@gmail.com>
Date: Tue, 19 Feb 2008 18:51:08 +0000 (+0000)
Subject: juggle() actually returns bool.
X-Git-Tag: upstream/7.37.1~8045
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9df37b93df57488c21bd2027da070193ea4883a6;p=platform%2Fupstream%2Fcurl.git

juggle() actually returns bool.

Remove redundant and unreachable log message.
---

diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 042b9f5..aeefb23 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -160,9 +160,9 @@ enum sockmode {
   if sockfd is CURL_SOCKET_BAD, listendfd is a listening socket we must
   accept()
 */
-static int juggle(curl_socket_t *sockfdp,
-                  curl_socket_t listenfd,
-                  enum sockmode *mode)
+static bool juggle(curl_socket_t *sockfdp,
+                   curl_socket_t listenfd,
+                   enum sockmode *mode)
 {
   struct timeval timeout;
   fd_set fds_read;
@@ -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.