From: Steve Holme <steve_holme@hotmail.com>
Date: Wed, 26 Feb 2014 21:02:53 +0000 (+0000)
Subject: tool_cfgable: Added GlobalConfig pointer to OperationConfig
X-Git-Tag: curl-7_36_0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17df2d8f8ee7864996c8a6a45886ccd6e34d065d;p=thirdparty%2Fcurl.git

tool_cfgable: Added GlobalConfig pointer to OperationConfig

In order to ease the moving of global options such as the error stream,
updated the OperationConfig structure to point to the GlobalConfig.
---

diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index e88b978961..77c603752f 100644
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -27,6 +27,8 @@
 
 #include "tool_metalink.h"
 
+struct GlobalConfig;
+
 struct OperationConfig {
   CURL *easy;               /* A copy of the handle from GlobalConfig */
   bool remote_time;
@@ -213,6 +215,7 @@ struct OperationConfig {
   bool nonpn;                 /* enable/disable TLS NPN extension */
   bool noalpn;                /* enable/disable TLS ALPN extension */
 
+  struct GlobalConfig *global;
   struct OperationConfig* prev;
   struct OperationConfig* next; /* Always last in the struct */
 };
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index e4cc69dd1f..b9c5eb7019 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -1838,6 +1838,9 @@ ParameterError parse_args(struct GlobalConfig *config, int argc,
               /* Copy the easy handle */
               operation->next->easy = config->easy;
 
+              /* Set the global config pointer */
+              operation->next->global = config;
+
               /* Update the last operation pointer */
               config->last = operation->next;
 
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 9adbe8229e..53e2660a6f 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -236,6 +236,9 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
             /* Copy the easy handle */
             operation->next->easy = global->easy;
 
+            /* Set the global config pointer */
+            operation->next->global = global;
+
             /* Update the last operation pointer */
             global->last = operation->next;