moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

use size_t better for buffer and alloc lengths

Browse Source
This commit is contained in:
Daniel Stenberg 2004-05-12 08:00:21 +00:00
parent 2f60e91a9b
commit c9bab31a7f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/transfer.c
View File

@ -296,7 +296,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
do { do {
int hbufp_index; int hbufp_index;
int rest_length; int rest_length;
int full_length; size_t full_length;
int writetype; int writetype;
/* str_start is start of line within buf */ /* str_start is start of line within buf */
@ -356,8 +356,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if (k->hbuflen + full_length >= if (k->hbuflen + full_length >=
data->state.headersize) { data->state.headersize) {
char *newbuff; char *newbuff;
long newsize=CURLMAX((k->hbuflen+full_length)*3/2, size_t newsize=CURLMAX((k->hbuflen+full_length)*3/2,
data->state.headersize*2); data->state.headersize*2);
hbufp_index = k->hbufp - data->state.headerbuff; hbufp_index = k->hbufp - data->state.headerbuff;
newbuff = (char *)realloc(data->state.headerbuff, newsize); newbuff = (char *)realloc(data->state.headerbuff, newsize);
if(!newbuff) { if(!newbuff) {
@ -667,7 +667,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
else if (checkprefix("Content-Type:", k->p)) { else if (checkprefix("Content-Type:", k->p)) {
char *start; char *start;
char *end; char *end;
int len; size_t len;
/* Find the first non-space letter */ /* Find the first non-space letter */
for(start=k->p+13; for(start=k->p+13;
@ -1643,7 +1643,7 @@ CURLcode Curl_follow(struct SessionHandle *data,
/* Location: redirect */ /* Location: redirect */
char prot[16]; /* URL protocol string storage */ char prot[16]; /* URL protocol string storage */
char letter; /* used for a silly sscanf */ char letter; /* used for a silly sscanf */
int newlen; size_t newlen;
char *newest; char *newest;
if (data->set.maxredirs && if (data->set.maxredirs &&
@ -1683,7 +1683,7 @@ CURLcode Curl_follow(struct SessionHandle *data,
char *pathsep; char *pathsep;
char *useurl = newurl; char *useurl = newurl;
int urllen; size_t urllen;
/* we must make our own copy of the URL to play with, as it may /* we must make our own copy of the URL to play with, as it may
point to read-only data */ point to read-only data */

4
lib/urldata.h
View File

@ -337,7 +337,7 @@ struct Curl_transfer_keeper {
int headerline; /* counts header lines to better track the int headerline; /* counts header lines to better track the
first one */ first one */
char *hbufp; /* points at *end* of header line */ char *hbufp; /* points at *end* of header line */
int hbuflen; size_t hbuflen;
char *str; /* within buf */ char *str; /* within buf */
char *str_start; /* within buf */ char *str_start; /* within buf */
char *end_ptr; /* within buf */ char *end_ptr; /* within buf */
@ -704,7 +704,7 @@ struct UrlState {
long numconnects; /* size of the 'connects' array */ long numconnects; /* size of the 'connects' array */
char *headerbuff; /* allocated buffer to store headers in */ char *headerbuff; /* allocated buffer to store headers in */
int headersize; /* size of the allocation */ size_t headersize; /* size of the allocation */
char buffer[BUFSIZE+1]; /* download buffer */ char buffer[BUFSIZE+1]; /* download buffer */
char uploadbuffer[BUFSIZE+1]; /* upload buffer */ char uploadbuffer[BUFSIZE+1]; /* upload buffer */