summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-05-03 23:05:32 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-05-03 23:10:49 +0200
commitbccf1dce53abd6df2324d423f4bf9c2091b55a19 (patch)
tree5ec5af9942754b680d94b70cf5aa7a74ed3b865a /packages
parentbdb2dbc1032e7ca33cfc161fd1d5bfbabdf65841 (diff)
downloadcurl-bccf1dce53abd6df2324d423f4bf9c2091b55a19.tar.gz
OS400/ccsidcurl: replace use of Curl_vsetopt
(and make the code style comply) Fixes #3833
Diffstat (limited to 'packages')
-rw-r--r--packages/OS400/ccsidcurl.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index a4cae27ee..e3e891c90 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1141,7 +1141,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
(int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1)
curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
- }
+ }
data = (struct Curl_easy *) curl;
va_start(arg, tag);
@@ -1235,8 +1235,8 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if(!s) {
result = CURLE_OUT_OF_MEMORY;
break;
- }
}
+ }
result = curl_easy_setopt(curl, tag, s);
free(s);
@@ -1254,7 +1254,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if(!s || !pfsize || ccsid == NOCONV_CCSID || ccsid == ASCII_CCSID) {
result = curl_easy_setopt(curl, CURLOPT_COPYPOSTFIELDS, s);
break;
- }
+ }
if(pfsize == -1) {
/* Data is null-terminated. */
@@ -1272,7 +1272,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if(pfsize < 0 || pfsize > SIZE_MAX) {
result = CURLE_OUT_OF_MEMORY;
break;
- }
+ }
len = pfsize;
pfsize = len * MAX_CONV_EXPANSION;
@@ -1285,7 +1285,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if(!cp) {
result = CURLE_OUT_OF_MEMORY;
break;
- }
+ }
pfsize = convert(cp, pfsize, ASCII_CCSID, s, len, ccsid);
@@ -1293,11 +1293,11 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
free(cp);
result = CURLE_OUT_OF_MEMORY;
break;
- }
+ }
data->set.postfieldsize = pfsize; /* Replace data size. */
s = cp;
- }
+ }
result = curl_easy_setopt(curl, CURLOPT_POSTFIELDS, s);
data->set.str[STRING_COPYPOSTFIELDS] = s; /* Give to library. */
@@ -1305,9 +1305,12 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_ERRORBUFFER: /* This is an output buffer. */
default:
- result = Curl_vsetopt(data, tag, arg);
+ {
+ long val = va_arg(arg, long);
+ result = curl_easy_setopt(curl, tag, val);
break;
- }
+ }
+ }
va_end(arg);
return result;