romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 10:46:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_formparse: polish error message + make two functions static

Browse source 
Closes #21510
This commit is contained in:
Daniel Stenberg 2026-05-06 08:50:44 +02:00
parent e0df43b9d3
commit 21687202d9
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/tool_formparse.c
View file

@ -192,8 +192,8 @@ void tool_mime_free(struct tool_mime *mime)
}
/* Mime part callbacks for stdin. */
size_t tool_mime_stdin_read(char *buffer,
size_t size, size_t nitems, void *arg)
static size_t tool_mime_stdin_read(char *buffer,
size_t size, size_t nitems, void *arg)
{
struct tool_mime *sip = (struct tool_mime *)arg;
curl_off_t bytesleft;
@ -217,7 +217,8 @@ size_t tool_mime_stdin_read(char *buffer,
if(ferror(stdin)) {
char errbuf[STRERROR_LEN];
/* Show error only once. */
warnf("stdin: %s", curlx_strerror(errno, errbuf, sizeof(errbuf)));
warnf("Failed to read from stdin: %s",
curlx_strerror(errno, errbuf, sizeof(errbuf)));
return CURL_READFUNC_ABORT;
}
}
@ -226,7 +227,7 @@ size_t tool_mime_stdin_read(char *buffer,
return nitems;
}
int tool_mime_stdin_seek(void *instream, curl_off_t offset, int whence)
static int tool_mime_stdin_seek(void *instream, curl_off_t offset, int whence)
{
struct tool_mime *sip = (struct tool_mime *)instream;
@ -294,8 +295,8 @@ static CURLcode tool2curlparts(CURL *curl, struct tool_mime *m,
FALLTHROUGH();
case TOOLMIME_STDINDATA:
result = curl_mime_data_cb(part, m->size,
(curl_read_callback)tool_mime_stdin_read,
(curl_seek_callback)tool_mime_stdin_seek,
tool_mime_stdin_read,
tool_mime_stdin_seek,
NULL, m);
break;

4
src/tool_formparse.h
View file

@ -57,10 +57,6 @@ struct tool_mime {
curl_off_t curpos; /* Stdin current read position. */
};
size_t tool_mime_stdin_read(char *buffer,
size_t size, size_t nitems, void *arg);
int tool_mime_stdin_seek(void *instream, curl_off_t offset, int whence);
int formparse(const char *input,
struct tool_mime **mimeroot,
struct tool_mime **mimecurrent,