moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 00:28:48 -05:00
Code Issues Releases Wiki Activity

tool_main: Moved config struct initialisation into a separate function

Browse Source 
In preparation for adding URL specific options moved the initialisation
of the Configurable structure into a separate function in tool_cfgable.
This commit is contained in:
Steve Holme 2014-02-01 13:26:09 +00:00
parent e5acae0052
commit 83dbd06936
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tool_cfgable.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -25,6 +25,13 @@
#include "memdebug.h" /* keep this as LAST include */ #include "memdebug.h" /* keep this as LAST include */
void init_config(struct Configurable* config)
{
memset(config, 0, sizeof(struct Configurable));
config->errors = stderr; /* default errors to stderr */
}
void free_config_fields(struct Configurable *config) void free_config_fields(struct Configurable *config)
{ {
struct getout *urlnode; struct getout *urlnode;

3
src/tool_cfgable.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -216,6 +216,7 @@ struct Configurable {
char *xoauth2_bearer; /* XOAUTH2 bearer token */ char *xoauth2_bearer; /* XOAUTH2 bearer token */
}; /* struct Configurable */ }; /* struct Configurable */
void init_config(struct Configurable* config);
void free_config_fields(struct Configurable *config); void free_config_fields(struct Configurable *config);
#endif /* HEADER_CURL_TOOL_CFGABLE_H */ #endif /* HEADER_CURL_TOOL_CFGABLE_H */

7
src/tool_main.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -90,9 +90,8 @@ int main(int argc, char *argv[])
int res; int res;
struct Configurable config; struct Configurable config;
memset(&config, 0, sizeof(struct Configurable)); /* Initialise the config */
init_config(&config);
config.errors = stderr; /* default errors to stderr */
main_checkfds(); main_checkfds();