diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-02-01 13:26:09 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-02-01 13:44:00 +0000 |
| commit | 83dbd0693677dae6d94a88f322fd1b50fdc3138c (patch) | |
| tree | 455cebf8fa35976069d7cb8e30db7ef0db927841 /src | |
| parent | e5acae0052fbe877979dcbf4a1434a12fa23d70a (diff) | |
tool_main: Moved config struct initialisation into a separate function
In preparation for adding URL specific options moved the initialisation
of the Configurable structure into a separate function in tool_cfgable.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_cfgable.c | 9 | ||||
| -rw-r--r-- | src/tool_cfgable.h | 3 | ||||
| -rw-r--r-- | src/tool_main.c | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c index f9fd55283..5ee46871c 100644 --- a/src/tool_cfgable.c +++ b/src/tool_cfgable.c @@ -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 * you should have received as part of this distribution. The terms @@ -25,6 +25,13 @@ #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) { struct getout *urlnode; diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index c1687328d..fa4ec7ec0 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -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 * you should have received as part of this distribution. The terms @@ -216,6 +216,7 @@ struct Configurable { char *xoauth2_bearer; /* XOAUTH2 bearer token */ }; /* struct Configurable */ +void init_config(struct Configurable* config); void free_config_fields(struct Configurable *config); #endif /* HEADER_CURL_TOOL_CFGABLE_H */ diff --git a/src/tool_main.c b/src/tool_main.c index 8f2fbb77b..fe0768747 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -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 * you should have received as part of this distribution. The terms @@ -90,9 +90,8 @@ int main(int argc, char *argv[]) int res; struct Configurable config; - memset(&config, 0, sizeof(struct Configurable)); - - config.errors = stderr; /* default errors to stderr */ + /* Initialise the config */ + init_config(&config); main_checkfds(); |