diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-26 11:02:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-07-24 15:21:56 -0400 |
| commit | c32d485942e766eeea70cab468cc7c727a5be270 (patch) | |
| tree | 5a876c6f70633e1678dd6958d53ce6955101099c /src | |
| parent | f8b193a74a3967d23bf55c8dcfb5bb2a16692c97 (diff) | |
| download | tor-c32d485942e766eeea70cab468cc7c727a5be270.tar.gz tor-c32d485942e766eeea70cab468cc7c727a5be270.zip | |
Remove src/core/ and src/feature dependencies from confparse.c
This C file will eventually belong in lib/confmgt, so it needs to
have only low-level dependencies. Now that it no longers needs
routerset.c, we can adjust its includes accordingly.
I'm not moving the file yet, since it would make fixup commits on
earlier branches here really hard to do.
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/config/confparse.c | 12 | ||||
| -rw-r--r-- | src/app/config/confparse.h | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 9bc0b1dc75..699fc0e3dd 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -22,14 +22,20 @@ */ #define CONFPARSE_PRIVATE -#include "core/or/or.h" +#include "orconfig.h" #include "app/config/confparse.h" -#include "feature/nodelist/routerset.h" +#include "lib/confmgt/structvar.h" #include "lib/confmgt/unitparse.h" #include "lib/container/bitarray.h" +#include "lib/container/smartlist.h" #include "lib/encoding/confline.h" -#include "lib/confmgt/structvar.h" +#include "lib/log/escape.h" +#include "lib/log/log.h" +#include "lib/log/util_bug.h" +#include "lib/string/compat_ctype.h" +#include "lib/string/printf.h" +#include "lib/string/util_string.h" static void config_reset(const config_format_t *fmt, void *options, const config_var_t *var, int use_defaults); diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 65972d6fcb..3633c2a80b 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -15,6 +15,7 @@ #include "lib/conf/conftypes.h" #include "lib/conf/confmacros.h" +#include "lib/testsupport/testsupport.h" /** An abbreviation for a configuration option allowed on the command line. */ typedef struct config_abbrev_t { |