From: Marty Kuhrt Date: Fri, 30 Dec 2005 00:07:25 +0000 (+0000) Subject: putting back into dist X-Git-Tag: curl-7_15_2~101 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b11dec5dd5a4e727be964448b9c5d14cd0ace974;p=curl putting back into dist --- diff --git a/lib/file.c b/lib/file.c index dbfe81cfa..8926105e9 100644 --- a/lib/file.c +++ b/lib/file.c @@ -230,11 +230,11 @@ static CURLcode file_upload(struct connectdata *conn) if(res) break; - nread = (size_t)readcount; - - if (nread <= 0) + if (readcount <= 0) break; + nread = (size_t)readcount; + /* write the data to the target */ nwrite = fwrite(buf, 1, nread, fp); if(nwrite != nread) { diff --git a/lib/parsedate.c b/lib/parsedate.c index 52684825f..864231b0e 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -391,7 +391,7 @@ static time_t Curl_parsedate(const char *date) t = mktime(&tm); /* time zone adjust */ - if(-1 != t) { + if(-1 != (int)t) { struct tm *gmt; long delta; time_t t2;