Просмотр исходного кода

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.
Nick Mathewson 6 лет назад
Родитель
Сommit
c32d485942
2 измененных файлов с 10 добавлено и 3 удалено
  1. 9 3
      src/app/config/confparse.c
  2. 1 0
      src/app/config/confparse.h

+ 9 - 3
src/app/config/confparse.c

@@ -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 - 0
src/app/config/confparse.h

@@ -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 {