Commit 83dbd069 authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent e5acae00

src/tool_cfgable.c

+8 −1
Original line number Diff line number Diff line
@@ -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;

src/tool_cfgable.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

src/tool_main.c

+3 −4
Original line number Diff line number Diff line
@@ -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();