diff options
| author | Maxim Yurchuk <maxim-yurchuk@ydb.tech> | 2024-10-04 17:24:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-04 17:24:16 +0300 |
| commit | a1e4766748b5924d3879ab6a0259b28ec3c5d535 (patch) | |
| tree | 4480150864228623d6c9101a4ba8c049bda9aa90 /contrib/libs/curl/src/tool_formparse.c | |
| parent | 6536467764bed7822214815ce92ed4dcd5bf409b (diff) | |
| parent | a46fe128b9c9c84438fc2aac337aeefdaecb99df (diff) | |
| download | ydb-a1e4766748b5924d3879ab6a0259b28ec3c5d535.tar.gz | |
Merge pull request #10090 from ydb-platform/mergelibs-241004-1110
Library import 241004-1110
Diffstat (limited to 'contrib/libs/curl/src/tool_formparse.c')
| -rw-r--r-- | contrib/libs/curl/src/tool_formparse.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/contrib/libs/curl/src/tool_formparse.c b/contrib/libs/curl/src/tool_formparse.c index fa38698d5e..15918d3ee5 100644 --- a/contrib/libs/curl/src/tool_formparse.c +++ b/contrib/libs/curl/src/tool_formparse.c @@ -25,8 +25,6 @@ #include "strcase.h" -#define ENABLE_CURLX_PRINTF -/* use our own printf() functions */ #include "curlx.h" #include "tool_cfgable.h" @@ -278,7 +276,7 @@ static CURLcode tool2curlparts(CURL *curl, struct tool_mime *m, case TOOLMIME_STDIN: if(!filename) filename = "-"; - /* FALLTHROUGH */ + FALLTHROUGH(); case TOOLMIME_STDINDATA: ret = curl_mime_data_cb(part, m->size, (curl_read_callback) tool_mime_stdin_read, @@ -637,7 +635,7 @@ static int get_param_part(struct OperationConfig *config, char endchar, *pfilename = filename; else if(filename) warnf(config->global, - "Field file name not allowed here: %s", filename); + "Field filename not allowed here: %s", filename); if(pencoder) *pencoder = encoder; @@ -693,7 +691,7 @@ static int get_param_part(struct OperationConfig *config, char endchar, * 'name=foo;headers=@headerfile' or why not * 'name=@filemame;headers=@headerfile' * - * To upload a file, but to fake the file name that will be included in the + * To upload a file, but to fake the filename that will be included in the * formpost, do like this: * * 'name=@filename;filename=/dev/null' or quote the faked filename like: @@ -720,7 +718,7 @@ int formparse(struct OperationConfig *config, struct tool_mime **mimecurrent, bool literal_value) { - /* input MUST be a string in the format 'name=contents' and we'll + /* input MUST be a string in the format 'name=contents' and we will build a linked list with the info */ char *name = NULL; char *contents = NULL; @@ -779,7 +777,7 @@ int formparse(struct OperationConfig *config, } else if('@' == contp[0] && !literal_value) { - /* we use the @-letter to indicate file name(s) */ + /* we use the @-letter to indicate filename(s) */ struct tool_mime *subparts = NULL; @@ -831,7 +829,7 @@ int formparse(struct OperationConfig *config, SET_TOOL_MIME_PTR(part, encoder); /* *contp could be '\0', so we just check with the delimiter */ - } while(sep); /* loop if there's another file name */ + } while(sep); /* loop if there is another filename */ part = (*mimecurrent)->subparts; /* Set name on group. */ } else { |