diff options
| author | ng0 <ng0@n0.is> | 2019-11-06 19:43:08 +0000 |
|---|---|---|
| committer | ng0 <ng0@n0.is> | 2019-11-06 19:43:08 +0000 |
| commit | 03d326c16b69a3db6b369e8a05fd0fdf23a7cf35 (patch) | |
| tree | 5f21975cd8220ffe2ce2894d6146f23eeb3dcfa9 /lib/mime.c | |
| parent | 3671d2089f040bd0a86d263f9baa43ea5341e4f2 (diff) | |
| parent | 2e9b725f67d49a9d7a1f053fe52dd4920c9ab1ad (diff) | |
| download | gnurl-03d326c16b69a3db6b369e8a05fd0fdf23a7cf35.tar.gz gnurl-03d326c16b69a3db6b369e8a05fd0fdf23a7cf35.tar.bz2 gnurl-03d326c16b69a3db6b369e8a05fd0fdf23a7cf35.zip | |
Merge tag 'curl-7_67_0'
7.67.0
Diffstat (limited to 'lib/mime.c')
| -rw-r--r-- | lib/mime.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/mime.c b/lib/mime.c index eb77cbddd..c974d195a 100644 --- a/lib/mime.c +++ b/lib/mime.c @@ -1135,6 +1135,8 @@ CURLcode Curl_mime_duppart(curl_mimepart *dst, const curl_mimepart *src) const curl_mimepart *s; CURLcode res = CURLE_OK; + DEBUGASSERT(dst); + /* Duplicate content. */ switch(src->kind) { case MIMEKIND_NONE: @@ -1184,20 +1186,18 @@ CURLcode Curl_mime_duppart(curl_mimepart *dst, const curl_mimepart *src) } } - /* Duplicate other fields. */ - if(dst != NULL) + if(!res) { + /* Duplicate other fields. */ dst->encoder = src->encoder; - else - res = CURLE_WRITE_ERROR; - if(!res) res = curl_mime_type(dst, src->mimetype); + } if(!res) res = curl_mime_name(dst, src->name); if(!res) res = curl_mime_filename(dst, src->filename); /* If an error occurred, rollback. */ - if(res && dst) + if(res) Curl_mime_cleanpart(dst); return res; @@ -1901,4 +1901,11 @@ CURLcode curl_mime_headers(curl_mimepart *part, return CURLE_NOT_BUILT_IN; } +CURLcode Curl_mime_add_header(struct curl_slist **slp, const char *fmt, ...) +{ + (void)slp; + (void)fmt; + return CURLE_NOT_BUILT_IN; +} + #endif /* if disabled */ |