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

curl: unify pointer names to global config

Browse source 
Use 'config' for pointing to a OperationConfig

Use 'global' for pointing to GlobalConfig

Bonus: add config_alloc(), an easier way to allocate + init a new
OperationConfig struct.

Closes #17888
This commit is contained in:
Daniel Stenberg 2025-07-10 16:10:59 +02:00
parent 695eee432f
commit d516628d14
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
20 changed files with 110 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/tool_setopt.c
View file

@ -223,7 +223,7 @@ static char *c_escape(const char *str, curl_off_t len)
}
/* setopt wrapper for enum types */
CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *config,
CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
const struct NameValue *nvlist, long lval)
{
@ -234,7 +234,7 @@ CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *config,
if(!lval)
skip = TRUE;
if(config->libcurl && !skip && !ret) {
if(global->libcurl && !skip && !ret) {
/* we only use this for real if --libcurl was used */
const struct NameValue *nv = NULL;
for(nv = nvlist; nv->name; nv++) {
@ -256,13 +256,13 @@ CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *config,
#ifdef DEBUGBUILD
if(ret)
warnf(config, "option %s returned error (%d)", name, (int)ret);
warnf(global, "option %s returned error (%d)", name, (int)ret);
#endif
return ret;
}
/* setopt wrapper for CURLOPT_SSLVERSION */
CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *config,
CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
long lval)
{
@ -273,7 +273,7 @@ CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *config,
if(!lval)
skip = TRUE;
if(config->libcurl && !skip && !ret) {
if(global->libcurl && !skip && !ret) {
/* we only use this for real if --libcurl was used */
const struct NameValue *nv = NULL;
const struct NameValue *nv2 = NULL;
@ -301,13 +301,13 @@ CURLcode tool_setopt_SSLVERSION(CURL *curl, struct GlobalConfig *config,
#ifdef DEBUGBUILD
if(ret)
warnf(config, "option %s returned error (%d)", name, (int)ret);
warnf(global, "option %s returned error (%d)", name, (int)ret);
#endif
return ret;
}
/* setopt wrapper for bitmasks */
CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *config,
CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
const struct NameValueUnsigned *nvlist,
long lval)
@ -317,7 +317,7 @@ CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *config,
if(!lval)
skip = TRUE;
if(config->libcurl && !skip && !ret) {
if(global->libcurl && !skip && !ret) {
/* we only use this for real if --libcurl was used */
char preamble[80];
unsigned long rest = (unsigned long)lval;
@ -379,13 +379,13 @@ static CURLcode libcurl_generate_slist(struct curl_slist *slist, int *slistno)
}
static CURLcode libcurl_generate_mime(CURL *curl,
struct GlobalConfig *config,
struct GlobalConfig *global,
struct tool_mime *toolmime,
int *mimeno); /* Forward. */
/* Wrapper to generate source code for a mime part. */
static CURLcode libcurl_generate_mime_part(CURL *curl,
struct GlobalConfig *config,
struct GlobalConfig *global,
struct tool_mime *part,
int mimeno)
{
@ -396,7 +396,7 @@ static CURLcode libcurl_generate_mime_part(CURL *curl,
/* Parts are linked in reverse order. */
if(part->prev)
ret = libcurl_generate_mime_part(curl, config, part->prev, mimeno);
ret = libcurl_generate_mime_part(curl, global, part->prev, mimeno);
/* Create the part. */
if(!ret)
@ -407,7 +407,7 @@ static CURLcode libcurl_generate_mime_part(CURL *curl,
switch(part->kind) {
case TOOLMIME_PARTS:
ret = libcurl_generate_mime(curl, config, part, &submimeno);
ret = libcurl_generate_mime(curl, global, part, &submimeno);
if(!ret) {
ret = easysrc_addf(&easysrc_code, "curl_mime_subparts(part%d, mime%d);",
mimeno, submimeno);
@ -507,7 +507,7 @@ static CURLcode libcurl_generate_mime_part(CURL *curl,
/* Wrapper to generate source code for a mime structure. */
static CURLcode libcurl_generate_mime(CURL *curl,
struct GlobalConfig *config,
struct GlobalConfig *global,
struct tool_mime *toolmime,
int *mimeno)
{
@ -529,7 +529,7 @@ static CURLcode libcurl_generate_mime(CURL *curl,
if(toolmime->subparts && !ret) {
ret = easysrc_addf(&easysrc_decl, "curl_mimepart *part%d;", *mimeno);
if(!ret)
ret = libcurl_generate_mime_part(curl, config,
ret = libcurl_generate_mime_part(curl, global,
toolmime->subparts, *mimeno);
}
@ -537,16 +537,16 @@ static CURLcode libcurl_generate_mime(CURL *curl,
}
/* setopt wrapper for CURLOPT_MIMEPOST */
CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *config,
CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
curl_mime *mimepost)
{
CURLcode ret = curl_easy_setopt(curl, tag, mimepost);
int mimeno = 0;
if(!ret && config->libcurl) {
ret = libcurl_generate_mime(curl, config,
config->current->mimeroot, &mimeno);
if(!ret && global->libcurl) {
ret = libcurl_generate_mime(curl, global,
global->current->mimeroot, &mimeno);
if(!ret)
ret = easysrc_addf(&easysrc_code, "curl_easy_setopt(hnd, %s, mime%d);",
@ -557,7 +557,7 @@ CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *config,
}
/* setopt wrapper for curl_slist options */
CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *config,
CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
struct curl_slist *list)
{
@ -565,7 +565,7 @@ CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *config,
ret = curl_easy_setopt(curl, tag, list);
if(config->libcurl && list && !ret) {
if(global->libcurl && list && !ret) {
int i;
ret = libcurl_generate_slist(list, &i);