From: Daniel Stenberg Date: Sun, 11 Sep 2022 21:59:38 +0000 (+0200) Subject: tool_setopt: use better English in --libcurl source comments X-Git-Tag: curl-7_86_0~256 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d254bbced945fdca6811ff47a5546d7e7747c5b;p=thirdparty%2Fcurl.git tool_setopt: use better English in --libcurl source comments Like this: XYZ was set to an object pointer ABC was set to a function pointer Closes #9475 --- diff --git a/src/tool_setopt.c b/src/tool_setopt.c index 764e1f73ce..5ea2541e0d 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -223,7 +223,7 @@ static const struct NameValue setopt_nv_CURLNONZERODEFAULTS[] = { #define REM0(s) ADD((&easysrc_toohard, s)) #define REM1(f,a) ADDF((&easysrc_toohard, f,a)) -#define REM2(f,a,b) ADDF((&easysrc_toohard, f,a,b)) +#define REM3(f,a,b,c) ADDF((&easysrc_toohard, f,a,b,c)) /* Escape string to C string syntax. Return NULL if out of memory. * Is this correct for those wacky EBCDIC guys? */ @@ -668,7 +668,7 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, /* function pointers are never printable */ if(tag >= CURLOPTTYPE_FUNCTIONPOINT) { if(pval) { - value = "functionpointer"; + value = "function pointer"; remark = TRUE; } else @@ -680,7 +680,7 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, escape = TRUE; } else if(pval) { - value = "objectpointer"; + value = "object pointer"; remark = TRUE; } else @@ -706,7 +706,7 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, /* blobs are never printable */ if(pblob) { - value = "blobpointer"; + value = "blob pointer"; remark = TRUE; } else @@ -721,7 +721,7 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, /* we only use this for real if --libcurl was used */ if(remark) - REM2("%s set to a %s", name, value); + REM3("%s was set to a%s %s", name, (*value == 'o' ? "n" : ""), value); else { if(escape) { curl_off_t len = ZERO_TERMINATED; diff --git a/tests/data/test1400 b/tests/data/test1400 index b4d29d3791..a92b2f22e0 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -82,18 +82,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1401 b/tests/data/test1401 index 247b061573..e4bc3b7361 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -97,18 +97,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1402 b/tests/data/test1402 index c111af4a9a..667be124c0 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -87,18 +87,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1403 b/tests/data/test1403 index 46bd63dceb..5ecf2d28cc 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -82,18 +82,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1404 b/tests/data/test1404 index 3b41c5cefa..906e9fcc2a 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -156,18 +156,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1405 b/tests/data/test1405 index aa7cf4da14..31b7d6971a 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -96,18 +96,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1406 b/tests/data/test1406 index 969df638e8..0be9bfa615 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -89,18 +89,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1407 b/tests/data/test1407 index 7f48de2d18..d5bfb7f5d3 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -69,18 +69,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1420 b/tests/data/test1420 index 92905faba9..415e35902b 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -74,18 +74,18 @@ int main(int argc, char *argv[]) as source easily. You may choose to either not use them or implement them yourself. - CURLOPT_WRITEDATA set to a objectpointer - CURLOPT_WRITEFUNCTION set to a functionpointer - CURLOPT_READDATA set to a objectpointer - CURLOPT_READFUNCTION set to a functionpointer - CURLOPT_SEEKDATA set to a objectpointer - CURLOPT_SEEKFUNCTION set to a functionpointer - CURLOPT_ERRORBUFFER set to a objectpointer - CURLOPT_STDERR set to a objectpointer - CURLOPT_DEBUGFUNCTION set to a functionpointer - CURLOPT_DEBUGDATA set to a objectpointer - CURLOPT_HEADERFUNCTION set to a functionpointer - CURLOPT_HEADERDATA set to a objectpointer + CURLOPT_WRITEDATA was set to an object pointer + CURLOPT_WRITEFUNCTION was set to a function pointer + CURLOPT_READDATA was set to an object pointer + CURLOPT_READFUNCTION was set to a function pointer + CURLOPT_SEEKDATA was set to an object pointer + CURLOPT_SEEKFUNCTION was set to a function pointer + CURLOPT_ERRORBUFFER was set to an object pointer + CURLOPT_STDERR was set to an object pointer + CURLOPT_DEBUGFUNCTION was set to a function pointer + CURLOPT_DEBUGDATA was set to an object pointer + CURLOPT_HEADERFUNCTION was set to a function pointer + CURLOPT_HEADERDATA was set to an object pointer */ diff --git a/tests/data/test1465 b/tests/data/test1465 index e8caaa2eff..356b1e1b94 100644 Binary files a/tests/data/test1465 and b/tests/data/test1465 differ