nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove src/core/ and src/feature dependencies from confparse.c

Browse Source 
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.
This commit is contained in:
Nick Mathewson 2019-06-26 11:02:23 -04:00
parent f8b193a74a
commit c32d485942
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/config/confparse.c
View File

@ -22,14 +22,20 @@
*/ */
#define CONFPARSE_PRIVATE #define CONFPARSE_PRIVATE
#include "core/or/or.h" #include "orconfig.h"
#include "app/config/confparse.h" #include "app/config/confparse.h"
#include "feature/nodelist/routerset.h"
#include "lib/confmgt/structvar.h"
#include "lib/confmgt/unitparse.h" #include "lib/confmgt/unitparse.h"
#include "lib/container/bitarray.h" #include "lib/container/bitarray.h"
#include "lib/container/smartlist.h"
#include "lib/encoding/confline.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, static void config_reset(const config_format_t *fmt, void *options,
const config_var_t *var, int use_defaults); const config_var_t *var, int use_defaults);

1
src/app/config/confparse.h
View File

@ -15,6 +15,7 @@
#include "lib/conf/conftypes.h" #include "lib/conf/conftypes.h"
#include "lib/conf/confmacros.h" #include "lib/conf/confmacros.h"
#include "lib/testsupport/testsupport.h"
/** An abbreviation for a configuration option allowed on the command line. */ /** An abbreviation for a configuration option allowed on the command line. */
typedef struct config_abbrev_t { typedef struct config_abbrev_t {