diff --git a/lib/formdata.c b/lib/formdata.c index e7e0dd9eef5b178f6a4befbfdd673a651b5872b1..41629cc752251e251e3206d7c40a83d688c43ce9 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -367,8 +367,8 @@ char *Curl_FormBoundary(void) return retstring; } -/* Used from http.c */ -void Curl_FormFree(struct FormData *form) +/* Used from http.c, this cleans a built FormData linked list */ +void Curl_formclean(struct FormData *form) { struct FormData *next; @@ -501,7 +501,9 @@ struct FormData *Curl_getFormData(struct HttpPost *post, fileread = strequal("-", file->contents)?stdin: /* binary read for win32 crap */ - fopen(file->contents, "rb"); +/*VMS??*/ fopen(file->contents, "rb"); /* ONLY ALLOWS FOR STREAM FILES ON VMS */ +/*VMS?? Stream files are OK, as are FIXED & VAR files WITHOUT implied CC */ +/*VMS?? For implied CC, every record needs to have a \n appended & 1 added to SIZE */ if(fileread) { while((nread = fread(buffer, 1, 1024, fileread))) { size += AddFormData(&form, diff --git a/lib/formdata.h b/lib/formdata.h index 4a0d8509d3691b0fd7f77a0f4f04cac3f5a6ef02..35a5ca7a89a33132de006f9c6cb818bd0f8530c3 100644 --- a/lib/formdata.h +++ b/lib/formdata.h @@ -49,6 +49,6 @@ int Curl_FormReader(char *buffer, char *Curl_FormBoundary(void); -void Curl_FormFree(struct FormData *); +void Curl_formclean(struct FormData *); #endif diff --git a/lib/http.c b/lib/http.c index 28292384e82598e40924a3002fc3587bd9fdc25e..42947749ed421451bcd4ea36e9a29700002ce077 100644 --- a/lib/http.c +++ b/lib/http.c @@ -364,7 +364,7 @@ CURLcode Curl_http_done(struct connectdata *conn) if(HTTPREQ_POST_FORM == data->httpreq) { *bytecount = http->readbytecount + http->writebytecount; - Curl_FormFree(http->sendit); /* Now free that whole lot */ + Curl_formclean(http->sendit); /* Now free that whole lot */ data->fread = http->storefread; /* restore */ data->in = http->in; /* restore */ @@ -731,7 +731,7 @@ CURLcode Curl_http(struct connectdata *conn) conn->firstsocket, &http->writebytecount); if(result) { - Curl_FormFree(http->sendit); /* free that whole lot */ + Curl_formclean(http->sendit); /* free that whole lot */ return result; } }