diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-03-31 14:20:13 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-04-01 00:14:05 +0200 |
| commit | 76c21ed3fda20c55201c734a9d47af02ab7f6e46 (patch) | |
| tree | 5ae387e95a923280f34d5b0d727e8820bdada4a5 | |
| parent | d5d85e70794622c31f4a4c7a2d904abc78189a51 (diff) | |
| download | curl-76c21ed3fda20c55201c734a9d47af02ab7f6e46.tar.gz | |
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
| -rw-r--r-- | lib/telnet.c | 12 |
1 files 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 */ |