curl: unify pointer names to global config

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

diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index 220ac576dbc270cb07bd492a105ee79661d01761..0e79c8d25ef15a9f6051d34890a81bc508fcd1c5 100644 (file)
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@@ -80,7 +80,7 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
                   void *userdata)
 {
   struct OperationConfig *operation = userdata;
-  struct GlobalConfig *config = operation->global;
+  struct GlobalConfig *global = operation->global;
   FILE *output = tool_stderr;
   const char *text;
   struct timeval tv;
@@ -95,7 +95,7 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
 
   (void)handle; /* not used */
 
-  if(config->tracetime) {
+  if(global->tracetime) {
     tv = tvrealnow();
     msnprintf(timebuf, sizeof(timebuf), "%s.%06ld ",
               hms_for_sec(tv.tv_sec), (long)tv.tv_usec);
@@ -103,7 +103,7 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
   else
     timebuf[0] = 0;
 
-  if(handle && config->traceids &&
+  if(handle && global->traceids &&
      !curl_easy_getinfo(handle, CURLINFO_XFER_ID, &xfer_id) && xfer_id >= 0) {
     if(!curl_easy_getinfo(handle, CURLINFO_CONN_ID, &conn_id) &&
         conn_id >= 0) {
@@ -117,28 +117,28 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
   else
     idsbuf[0] = 0;
 
-  if(!config->trace_stream) {
+  if(!global->trace_stream) {
     /* open for append */
-    if(!strcmp("-", config->trace_dump))
-      config->trace_stream = stdout;
-    else if(!strcmp("%", config->trace_dump))
+    if(!strcmp("-", global->trace_dump))
+      global->trace_stream = stdout;
+    else if(!strcmp("%", global->trace_dump))
       /* Ok, this is somewhat hackish but we do it undocumented for now */
-      config->trace_stream = tool_stderr;
+      global->trace_stream = tool_stderr;
     else {
-      config->trace_stream = fopen(config->trace_dump, FOPEN_WRITETEXT);
-      config->trace_fopened = TRUE;
+      global->trace_stream = fopen(global->trace_dump, FOPEN_WRITETEXT);
+      global->trace_fopened = TRUE;
     }
   }
 
-  if(config->trace_stream)
-    output = config->trace_stream;
+  if(global->trace_stream)
+    output = global->trace_stream;
 
   if(!output) {
-    warnf(config, "Failed to create/open output");
+    warnf(global, "Failed to create/open output");
     return 0;
   }
 
-  if(config->tracetype == TRACE_PLAIN) {
+  if(global->tracetype == TRACE_PLAIN) {
     static bool newl = FALSE;
     static bool traced_data = FALSE;
 
@@ -181,7 +181,7 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
            to stderr or stdout, we do not display the alert about the data not
            being shown as the data _is_ shown then just not via this
            function */
-        if(!config->isatty ||
+        if(!global->isatty ||
            ((output != tool_stderr) && (output != stdout))) {
           if(!newl)
             log_line_start(output, timebuf, idsbuf, type);
@@ -228,7 +228,7 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
   }
 
   dump(timebuf, idsbuf, text, output, (unsigned char *) data, size,
-       config->tracetype, type);
+       global->tracetype, type);
   return 0;
 }
 

diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index e27ec0adf7464d0c9de0348cb827ec0eb79b0d42..2904ea7c7bc203b0387e7e561dc74e033b9c58d0 100644 (file)
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -99,7 +99,7 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
 
 #ifdef DEBUGBUILD
   if(size * nmemb > (size_t)CURL_MAX_HTTP_HEADER) {
-    warnf(per->config->global, "Header data exceeds single call write limit");
+    warnf(per->config->global, "Header data exceeds write limit");
     return CURL_WRITEFUNC_ERROR;
   }
 #endif

diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index 17574c6ecad6f9ece897b66719f447ae95aae5ac..da0c8f55f4a09970da643572237438c70d744326 100644 (file)
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -152,14 +152,13 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
 
   if(config->show_headers) {
     if(bytes > (size_t)CURL_MAX_HTTP_HEADER) {
-      warnf(config->global, "Header data size exceeds single call write "
-            "limit");
+      warnf(config->global, "Header data size exceeds write limit");
       return CURL_WRITEFUNC_ERROR;
     }
   }
   else {
     if(bytes > (size_t)CURL_MAX_WRITE_SIZE) {
-      warnf(config->global, "Data size exceeds single call write limit");
+      warnf(config->global, "Data size exceeds write limit");
       return CURL_WRITEFUNC_ERROR;
     }
   }

diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index f3839b90b624c3b10cbdd26c62e57740e94ef0c7..975ef2a4582b71315bbce16a11178df1a744e6cd 100644 (file)
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -29,10 +29,14 @@
 #include "tool_main.h"
 #include "memdebug.h" /* keep this as LAST include */
 
-void config_init(struct OperationConfig *config)
+struct OperationConfig *config_alloc(struct GlobalConfig *global)
 {
-  memset(config, 0, sizeof(struct OperationConfig));
+  struct OperationConfig *config =
+    calloc(1, sizeof(struct OperationConfig));
+  if(!config)
+    return NULL;
 
+  config->global = global;
   config->use_httpget = FALSE;
   config->create_dirs = FALSE;
   config->maxredirs = DEFAULT_MAXREDIRS;
@@ -46,6 +50,7 @@ void config_init(struct OperationConfig *config)
   config->file_clobber_mode = CLOBBER_DEFAULT;
   config->upload_flags = CURLULFLAG_SEEN;
   curlx_dyn_init(&config->postdata, MAX_FILE2MEMORY);
+  return config;
 }
 
 static void free_config_fields(struct OperationConfig *config)

diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index 103a874b21b528ba4c386d7587ce48ffcb6f2513..62ca06ad1e521574ecb8b60c7a51b92575a6cd93 100644 (file)
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -73,8 +73,7 @@ struct State {
   char *uploadfile;
   curl_off_t infilenum; /* number of files to upload */
   curl_off_t up;        /* upload file counter within a single upload glob */
-  curl_off_t urlnum;    /* how many iterations this single URL has with ranges
-                           etc */
+  curl_off_t urlnum;    /* how many iterations this URL has with ranges etc */
   curl_off_t li;
 };
 
@@ -377,7 +376,7 @@ struct GlobalConfig {
   BIT(isatty);                    /* Updated internally if output is a tty */
 };
 
-void config_init(struct OperationConfig *config);
+struct OperationConfig *config_alloc(struct GlobalConfig *global);
 void config_free(struct OperationConfig *config);
 
 #endif /* HEADER_CURL_TOOL_CFGABLE_H */

diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index 9092bd9f34bd2142f576a1c3e6321c540e51b043..de3133c6349ba6dab0397122c62f9ac31438dbaf 100644 (file)
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@@ -170,10 +170,10 @@ CURLcode easysrc_cleanup(void)
   return ret;
 }
 
-void dumpeasysrc(struct GlobalConfig *config)
+void dumpeasysrc(struct GlobalConfig *global)
 {
   struct curl_slist *ptr;
-  char *o = config->libcurl;
+  char *o = global->libcurl;
 
   FILE *out;
   bool fopened = FALSE;
@@ -184,7 +184,7 @@ void dumpeasysrc(struct GlobalConfig *config)
   else
     out = stdout;
   if(!out)
-    warnf(config, "Failed to open %s to write libcurl code", o);
+    warnf(global, "Failed to open %s to write libcurl code", o);
   else {
     int i;
     const char *c;

diff --git a/src/tool_easysrc.h b/src/tool_easysrc.h
index f698c8f5cc23ef1af542b7f4991fb2f63f74e1ad..8cd602d932eb9c6a2a903f120aada5623c601af6 100644 (file)
--- a/src/tool_easysrc.h
+++ b/src/tool_easysrc.h
@@ -44,7 +44,7 @@ extern CURLcode easysrc_addf(struct slist_wc **plist,
 extern CURLcode easysrc_perform(void);
 extern CURLcode easysrc_cleanup(void);
 
-void dumpeasysrc(struct GlobalConfig *config);
+void dumpeasysrc(struct GlobalConfig *global);
 
 #else /* CURL_DISABLE_LIBCURL_OPTION is defined */
 

diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index d656a7ae6d5ffc81b93c1ceec3ced209c7a6914b..e322f8ddd2c3b6d19c261e7a5b9c41e5403cc97e 100644 (file)
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -223,9 +223,9 @@ size_t tool_mime_stdin_read(char *buffer,
       nitems = fread(buffer, 1, nitems, stdin);
       if(ferror(stdin)) {
         /* Show error only once. */
-        if(sip->config) {
-          warnf(sip->config, "stdin: %s", strerror(errno));
-          sip->config = NULL;
+        if(sip->global) {
+          warnf(sip->global, "stdin: %s", strerror(errno));
+          sip->global = NULL;
         }
         return CURL_READFUNC_ABORT;
       }
@@ -823,7 +823,7 @@ int formparse(struct OperationConfig *config,
           goto fail;
         part->headers = headers;
         headers = NULL;
-        part->config = config->global;
+        part->global = config->global;
         if(res == CURLE_READ_ERROR) {
             /* An error occurred while reading stdin: if read has started,
                issue the error now. Else, delay it until processed by
@@ -859,7 +859,7 @@ int formparse(struct OperationConfig *config,
           goto fail;
         part->headers = headers;
         headers = NULL;
-        part->config = config->global;
+        part->global = config->global;
         if(res == CURLE_READ_ERROR) {
             /* An error occurred while reading stdin: if read has started,
                issue the error now. Else, delay it until processed by

diff --git a/src/tool_formparse.h b/src/tool_formparse.h
index 35d5c952d50ba6572acbe2aa73631af4eb269148..96562fced572254103f19bcf44bc6b0349e62d25 100644 (file)
--- a/src/tool_formparse.h
+++ b/src/tool_formparse.h
@@ -55,7 +55,7 @@ struct tool_mime {
   curl_off_t origin;            /* Stdin read origin offset. */
   curl_off_t size;              /* Stdin data size. */
   curl_off_t curpos;            /* Stdin current read position. */
-  struct GlobalConfig *config;  /* For access from callback. */
+  struct GlobalConfig *global;  /* For access from callback. */
 };
 
 size_t tool_mime_stdin_read(char *buffer,

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 0770c4000d1189e673213e21fe79bb43b02309ff..d2ed72e350b11b4c96352d76988acc03e4ca1ee5 100644 (file)
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -2989,14 +2989,8 @@ ParameterError parse_args(struct GlobalConfig *global, int argc,
 
           if(config->url_list && config->url_list->url) {
             /* Allocate the next config */
-            config->next = malloc(sizeof(struct OperationConfig));
+            config->next = config_alloc(global);
             if(config->next) {
-              /* Initialise the newly created config */
-              config_init(config->next);
-
-              /* Set the global config pointer */
-              config->next->global = global;
-
               /* Update the last config pointer */
               global->last = config->next;
 

diff --git a/src/tool_getparam.h b/src/tool_getparam.h
index d84e85222571a3a40889bd89604e0aab61190145..601eb99f2570f1c539a055ac92cfce0ca1d54a7e 100644 (file)
--- a/src/tool_getparam.h
+++ b/src/tool_getparam.h
@@ -374,7 +374,7 @@ void parse_cert_parameter(const char *cert_parameter,
                           char **passphrase);
 #endif
 
-ParameterError parse_args(struct GlobalConfig *config, int argc,
+ParameterError parse_args(struct GlobalConfig *global, int argc,
                           argv_item_t argv[]);
 
 #if defined(UNICODE) && defined(_WIN32) && !defined(UNDER_CE)

diff --git a/src/tool_main.c b/src/tool_main.c
index 4fb92d473bdfcc8510418e1dde0d114bb409ffbc..1d0b42ab911c1e211ad20f1603cc5bcb44fceeb0 100644 (file)
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -145,7 +145,7 @@ static void memory_tracking_init(void)
  * _any_ libcurl usage. If this fails, *NO* libcurl functions may be
  * used, or havoc may be the result.
  */
-static CURLcode main_init(struct GlobalConfig *config)
+static CURLcode main_init(struct GlobalConfig *global)
 {
   CURLcode result = CURLE_OK;
 
@@ -155,68 +155,63 @@ static CURLcode main_init(struct GlobalConfig *config)
 #endif
 
   /* Initialise the global config */
-  config->showerror = FALSE;          /* show errors when silent */
-  config->styled_output = TRUE;       /* enable detection */
-  config->parallel_max = PARALLEL_DEFAULT;
+  global->showerror = FALSE;          /* show errors when silent */
+  global->styled_output = TRUE;       /* enable detection */
+  global->parallel_max = PARALLEL_DEFAULT;
 
   /* Allocate the initial operate config */
-  config->first = config->last = malloc(sizeof(struct OperationConfig));
-  if(config->first) {
+  global->first = global->last = config_alloc(global);
+  if(global->first) {
     /* Perform the libcurl initialization */
     result = curl_global_init(CURL_GLOBAL_DEFAULT);
     if(!result) {
       /* Get information about libcurl */
       result = get_libcurl_info();
 
-      if(!result) {
-        /* Initialise the config */
-        config_init(config->first);
-        config->first->global = config;
-      }
-      else {
-        errorf(config, "error retrieving curl library information");
-        free(config->first);
+      if(result) {
+        errorf(global, "error retrieving curl library information");
+        free(global->first);
       }
     }
     else {
-      errorf(config, "error initializing curl library");
-      free(config->first);
+      errorf(global, "error initializing curl library");
+      free(global->first);
     }
   }
   else {
-    errorf(config, "error initializing curl");
+    errorf(global, "error initializing curl");
     result = CURLE_FAILED_INIT;
   }
 
   return result;
 }
 
-static void free_globalconfig(struct GlobalConfig *config)
+static void free_globalconfig(struct GlobalConfig *global)
 {
-  tool_safefree(config->trace_dump);
+  tool_safefree(global->trace_dump);
 
-  if(config->trace_fopened && config->trace_stream)
-    fclose(config->trace_stream);
-  config->trace_stream = NULL;
+  if(global->trace_fopened && global->trace_stream)
+    fclose(global->trace_stream);
+  global->trace_stream = NULL;
 
-  tool_safefree(config->libcurl);
+  tool_safefree(global->libcurl);
 }
 
 /*
- * This is the main global destructor for the app. Call this after
- * _all_ libcurl usage is done.
+ * This is the main global destructor for the app. Call this after _all_
+ * libcurl usage is done.
  */
-static void main_free(struct GlobalConfig *config)
+static void main_free(struct GlobalConfig *global)
 {
   /* Cleanup the easy handle */
   /* Main cleanup */
   curl_global_cleanup();
-  free_globalconfig(config);
+  free_globalconfig(global);
 
-  /* Free the config structures */
-  config_free(config->last);
-  config->first = NULL;
-  config->last = NULL;
+  /* Free the OperationConfig structures */
+  config_free(global->last);
+  global->first = NULL;
+  global->last = NULL;
 }
 
 /*

diff --git a/src/tool_msgs.c b/src/tool_msgs.c
index ffd0945f76fb8b0c906b1009a564f44ece189b3a..294e27ad43847a36c827838a2e4c181ea604470f 100644 (file)
--- a/src/tool_msgs.c
+++ b/src/tool_msgs.c
@@ -34,19 +34,19 @@
 #define NOTE_PREFIX "Note: "
 #define ERROR_PREFIX "curl: "
 
-static void voutf(struct GlobalConfig *config,
+static void voutf(struct GlobalConfig *global,
                   const char *prefix,
                   const char *fmt,
                   va_list ap) CURL_PRINTF(3, 0);
 
-static void voutf(struct GlobalConfig *config,
+static void voutf(struct GlobalConfig *global,
                   const char *prefix,
                   const char *fmt,
                   va_list ap)
 {
   size_t width = (get_terminal_columns() - strlen(prefix));
   DEBUGASSERT(!strchr(fmt, '\n'));
-  if(!config->silent) {
+  if(!global->silent) {
     size_t len;
     char *ptr;
     char *print_buffer;
@@ -90,12 +90,12 @@ static void voutf(struct GlobalConfig *config,
  * Emit 'note' formatted message on configured 'errors' stream, if verbose was
  * selected.
  */
-void notef(struct GlobalConfig *config, const char *fmt, ...)
+void notef(struct GlobalConfig *global, const char *fmt, ...)
 {
   va_list ap;
   va_start(ap, fmt);
-  if(config->tracetype)
-    voutf(config, NOTE_PREFIX, fmt, ap);
+  if(global->tracetype)
+    voutf(global, NOTE_PREFIX, fmt, ap);
   va_end(ap);
 }
 
@@ -103,11 +103,11 @@ void notef(struct GlobalConfig *config, const char *fmt, ...)
  * Emit warning formatted message on configured 'errors' stream unless
  * mute (--silent) was selected.
  */
-void warnf(struct GlobalConfig *config, const char *fmt, ...)
+void warnf(struct GlobalConfig *global, const char *fmt, ...)
 {
   va_list ap;
   va_start(ap, fmt);
-  voutf(config, WARN_PREFIX, fmt, ap);
+  voutf(global, WARN_PREFIX, fmt, ap);
   va_end(ap);
 }
 
@@ -137,12 +137,12 @@ void helpf(FILE *errors, const char *fmt, ...)
  * Emit error message on error stream if not muted. When errors are not tied
  * to command line arguments, use helpf() for such errors.
  */
-void errorf(struct GlobalConfig *config, const char *fmt, ...)
+void errorf(struct GlobalConfig *global, const char *fmt, ...)
 {
-  if(!config->silent || config->showerror) {
+  if(!global->silent || global->showerror) {
     va_list ap;
     va_start(ap, fmt);
-    voutf(config, ERROR_PREFIX, fmt, ap);
+    voutf(global, ERROR_PREFIX, fmt, ap);
     va_end(ap);
   }
 }

diff --git a/src/tool_msgs.h b/src/tool_msgs.h
index e963efaa0b1f84dcb290f5a75c2dc14fc546b354..681c98a562f20fdcdffafa20b99137e83eb08091 100644 (file)
--- a/src/tool_msgs.h
+++ b/src/tool_msgs.h
@@ -26,13 +26,13 @@
 #include "tool_setup.h"
 #include "tool_cfgable.h"
 
-void warnf(struct GlobalConfig *config, const char *fmt, ...)
+void warnf(struct GlobalConfig *global, const char *fmt, ...)
   CURL_PRINTF(2, 3);
-void notef(struct GlobalConfig *config, const char *fmt, ...)
+void notef(struct GlobalConfig *global, const char *fmt, ...)
   CURL_PRINTF(2, 3);
 void helpf(FILE *errors, const char *fmt, ...)
   CURL_PRINTF(2, 3);
-void errorf(struct GlobalConfig *config, const char *fmt, ...)
+void errorf(struct GlobalConfig *global, const char *fmt, ...)
   CURL_PRINTF(2, 3);
 
 #endif /* HEADER_CURL_TOOL_MSGS_H */

diff --git a/src/tool_operate.h b/src/tool_operate.h
index 88fb5f989615e9b018239aa02aedc4d92928e9fe..e7c972d61d1186a97a91f093b0aa8f6a1a0c16c5 100644 (file)
--- a/src/tool_operate.h
+++ b/src/tool_operate.h
@@ -79,7 +79,7 @@ struct per_transfer {
   BIT(skip);  /* considered already done */
 };
 
-CURLcode operate(struct GlobalConfig *config, int argc, argv_item_t argv[]);
+CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[]);
 void single_transfer_cleanup(struct OperationConfig *config);
 
 extern struct per_transfer *transfers; /* first node */

diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index d9dfd55b50121074e804b91b6e8e3919bb38aafd..912ffd254154f96ddd95d70bdb4a24feac5ce954 100644 (file)
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -181,14 +181,8 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
       if(res == PARAM_NEXT_OPERATION) {
         if(operation->url_list && operation->url_list->url) {
           /* Allocate the next config */
-          operation->next = malloc(sizeof(struct OperationConfig));
+          operation->next = config_alloc(global);
           if(operation->next) {
-            /* Initialise the newly created config */
-            config_init(operation->next);
-
-            /* Set the global config pointer */
-            operation->next->global = global;
-
             /* Update the last operation pointer */
             global->last = operation->next;
 

diff --git a/src/tool_parsecfg.h b/src/tool_parsecfg.h
index 07a34621ae3be9833a463a0c14f4ed5bdb713476..0116d6a68db2da8e58bc3d7cb71219c75f760e24 100644 (file)
--- a/src/tool_parsecfg.h
+++ b/src/tool_parsecfg.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-int parseconfig(const char *filename, struct GlobalConfig *config);
+int parseconfig(const char *filename, struct GlobalConfig *global);
 
 bool my_get_line(FILE *fp, struct dynbuf *db, bool *error);
 

diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index 4d31a6f89115056d78bb0656ada20ad7943395b2..8870107ebea7c73d82b8a3e9a9efcff0b02f0d75 100644 (file)
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -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);

diff --git a/src/tool_setopt.h b/src/tool_setopt.h
index 14ac18cdc90bf4fd12239ea0f7f8f2830e34273e..d138d12327f657b9ce83c41d79d4876430a46500 100644 (file)
--- a/src/tool_setopt.h
+++ b/src/tool_setopt.h
@@ -75,22 +75,22 @@ extern const struct NameValueUnsigned setopt_nv_CURLHSTS[];
 
 /* Intercept setopt calls for --libcurl */
 
-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 *nv, long lval);
-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);
-CURLcode tool_setopt_flags(CURL *curl, struct GlobalConfig *config,
+CURLcode tool_setopt_flags(CURL *curl, struct GlobalConfig *global,
                            const char *name, CURLoption tag,
                            const struct NameValue *nv, long lval);
-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 *nv, long lval);
-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 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);
 CURLcode tool_setopt_long(CURL *curl, struct GlobalConfig *global,

diff --git a/tests/data/test96 b/tests/data/test96
index 2bf68cc4bf20690469642dd1df61ce8ec40ae7df..e862b84a0cc527706b14f5a05edf0d0980d6f0b5 100644 (file)
--- a/tests/data/test96
+++ b/tests/data/test96
@@ -31,6 +31,7 @@ curl memory tracking operational
 # Verify data after the test has been "shot"
 <verify>
 <file name="%LOGDIR/memdump">
+MEM tool_cfgable.c
 MEM tool_paramhlp.c
 MEM tool_cfgable.c
 MEM tool_cfgable.c