mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 15:48:49 -05:00
Curl_FormFree renamed to Curl_formclean, as it turns out VMS for example
requires all global symbols to be *case insentively* unique! curl_formfree is a global function we shouldn't touch.
This commit is contained in:
parent
7950a95401
commit
2cf45f68b0
@ -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,
|
||||
|
@ -49,6 +49,6 @@ int Curl_FormReader(char *buffer,
|
||||
|
||||
char *Curl_FormBoundary(void);
|
||||
|
||||
void Curl_FormFree(struct FormData *);
|
||||
void Curl_formclean(struct FormData *);
|
||||
|
||||
#endif
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user