diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-31 13:58:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-31 13:58:33 -0400 |
| commit | b76a161e019dd808119f9e6d3bfa54990e7dcb2c (patch) | |
| tree | 77e7fad14217bafdb36b9f9bfd30ee9d29e33ea7 /src/common/confline.h | |
| parent | 1f9764f90dfaf31abfb9ffb44601cf98f3d5a67e (diff) | |
| parent | ade9baaf9b40c419f3ddefe6c8ee8f2c5ec8edce (diff) | |
| download | tor-b76a161e019dd808119f9e6d3bfa54990e7dcb2c.tar.gz tor-b76a161e019dd808119f9e6d3bfa54990e7dcb2c.zip | |
Merge branch 'fix-torrcd-sandbox-22605v2'
Diffstat (limited to 'src/common/confline.h')
| -rw-r--r-- | src/common/confline.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/confline.h b/src/common/confline.h index 8256326f2d..feeb9f249d 100644 --- a/src/common/confline.h +++ b/src/common/confline.h @@ -7,6 +7,8 @@ #ifndef TOR_CONFLINE_H #define TOR_CONFLINE_H +#include "container.h" + /** Ordinary configuration line. */ #define CONFIG_LINE_NORMAL 0 /** Appends to previous configuration for the same option, even if we @@ -44,7 +46,8 @@ int config_lines_eq(config_line_t *a, config_line_t *b); int config_count_key(const config_line_t *a, const char *key); int config_get_lines(const char *string, config_line_t **result, int extended); int config_get_lines_include(const char *string, config_line_t **result, - int extended, int *has_include); + int extended, int *has_include, + smartlist_t *opened_lst); void config_free_lines(config_line_t *front); const char *parse_config_line_from_str_verbose(const char *line, char **key_out, char **value_out, |