gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] 142/205: telnet: (win32) fix read callback return v


From: gnunet
Subject: [GNUnet-SVN] [gnurl] 142/205: telnet: (win32) fix read callback return variable
Date: Thu, 20 Apr 2017 16:21:22 +0200

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.

commit 76c21ed3fda20c55201c734a9d47af02ab7f6e46
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Mar 31 14:20:13 2017 +0200

    telnet: (win32) fix read callback return variable
    
    telnet.c(1427,21): warning: comparison of constant 268435456 with
    expression of type 'CURLcode' is always false
    
    telnet.c(1433,21): warning: comparison of constant 268435457 with
    expression of type 'CURLcode' is always false
    
    Reviewed-by: Jay Satiro
    Reported-by: Gisle Vanem
    Bug: https://github.com/curl/curl/issues/1225#issuecomment-290340890
    
    Closes #1374
---
 lib/telnet.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/telnet.c b/lib/telnet.c
index a7c483dfe..39ca6bcf9 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -1421,22 +1421,22 @@ static CURLcode telnet_do(struct connectdata *conn, 
bool *done)
     {
       for(;;) {
         if(data->set.is_fread_set) {
+          size_t n;
           /* read from user-supplied method */
-          result = (int)data->state.fread_func(buf, 1, BUFSIZE - 1,
-                                               data->state.in);
-          if(result == CURL_READFUNC_ABORT) {
+          n = data->state.fread_func(buf, 1, BUFSIZE - 1, data->state.in);
+          if(n == CURL_READFUNC_ABORT) {
             keepon = FALSE;
             result = CURLE_READ_ERROR;
             break;
           }
 
-          if(result == CURL_READFUNC_PAUSE)
+          if(n == CURL_READFUNC_PAUSE)
             break;
 
-          if(result == 0)                        /* no bytes */
+          if(n == 0)                        /* no bytes */
             break;
 
-          readfile_read = result; /* fall thru with number of bytes read */
+          readfile_read = (DWORD)n; /* fall thru with number of bytes read */
         }
         else {
           /* read from stdin */

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]