generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compiler warning

Browse Source
This commit is contained in:
Yang Tse 2008-01-11 16:49:35 +00:00
parent 148d727525
commit a042090467
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/file.c
View File

@ -373,7 +373,7 @@ static CURLcode file_upload(struct connectdata *conn)
} }
else { else {
buf2 = buf + data->state.resume_from; buf2 = buf + data->state.resume_from;
nread -= data->state.resume_from; nread -= (size_t)data->state.resume_from;
data->state.resume_from = 0; data->state.resume_from = 0;
} }
} }
@ -426,6 +426,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
curl_off_t expected_size=0; curl_off_t expected_size=0;
bool fstated=FALSE; bool fstated=FALSE;
ssize_t nread; ssize_t nread;
size_t bytestoread;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
char *buf = data->state.buffer; char *buf = data->state.buffer;
curl_off_t bytecount = 0; curl_off_t bytecount = 0;
@ -535,10 +536,8 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
while(res == CURLE_OK) { while(res == CURLE_OK) {
/* Don't fill a whole buffer if we want less than all data */ /* Don't fill a whole buffer if we want less than all data */
if (expected_size < BUFSIZE-1) bytestoread = (expected_size < BUFSIZE-1)?(size_t)expected_size:BUFSIZE-1;
nread = read(fd, buf, expected_size); nread = read(fd, buf, bytestoread);
else
nread = read(fd, buf, BUFSIZE-1);
if( nread > 0) if( nread > 0)
buf[nread] = 0; buf[nread] = 0;