generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tool_cfgable: Added global config structure

Browse Source
This commit is contained in:
Steve Holme 2014-02-23 13:15:31 +00:00
parent 705a4cb549
commit 2249f7fe70
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tool_cfgable.h
View File

@ -28,7 +28,7 @@
#include "tool_metalink.h" #include "tool_metalink.h"
struct OperationConfig { struct OperationConfig {
CURL *easy; /* once we have one, we keep it here */ CURL *easy; /* A copy of the handle from GlobalConfig */
bool remote_time; bool remote_time;
char *random_file; char *random_file;
char *egd_file; char *egd_file;
@ -220,6 +220,13 @@ struct OperationConfig {
struct OperationConfig* next; /* Always last in the struct */ struct OperationConfig* next; /* Always last in the struct */
}; };
struct GlobalConfig {
CURL *easy; /* Once we have one, we keep it here */
struct OperationConfig *first;
struct OperationConfig *last; /* Always last in the struct */
};
void config_init(struct OperationConfig* config); void config_init(struct OperationConfig* config);
void config_free(struct OperationConfig* config); void config_free(struct OperationConfig* config);

5
src/tool_main.c
View File

@ -162,8 +162,11 @@ static void main_free(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
struct GlobalConfig global;
struct OperationConfig *config; struct OperationConfig *config;
memset(&global, 0, sizeof(global));
main_checkfds(); main_checkfds();
#if defined(HAVE_SIGNAL) && defined(SIGPIPE) #if defined(HAVE_SIGNAL) && defined(SIGPIPE)
@ -173,7 +176,7 @@ int main(int argc, char *argv[])
/* Initialize memory tracking */ /* Initialize memory tracking */
memory_tracking_init(); memory_tracking_init();
/* Allocate the initial config */ /* Allocate the initial operate config */
config = malloc(sizeof(struct OperationConfig)); config = malloc(sizeof(struct OperationConfig));
if(config) { if(config) {