[tor-commits] [tor/master] Update #includes to point to confparse.h in its new location.

dgoulet at torproject.org dgoulet at torproject.org
Thu Sep 12 17:54:50 UTC 2019


commit a90d1918af5d2b6c6e6dd2c0797f8a63d4042bfa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 11 10:17:20 2019 -0400

    Update #includes to point to confparse.h in its new location.
    
    This commit was automatically generated by running
    scripts/maint/rectify_include_paths.py .
---
 src/app/config/config.c                   | 2 +-
 src/app/config/statefile.c                | 2 +-
 src/core/or/circuitbuild.c                | 2 +-
 src/core/or/circuitstats.c                | 2 +-
 src/feature/client/entrynodes.c           | 2 +-
 src/feature/control/control_cmd.c         | 2 +-
 src/feature/dirauth/shared_random.c       | 2 +-
 src/feature/dirauth/shared_random_state.c | 2 +-
 src/feature/hs/hs_dos.c                   | 2 +-
 src/lib/confmgt/confparse.c               | 2 +-
 src/test/test_btrack.c                    | 2 +-
 src/test/test_config.c                    | 2 +-
 src/test/test_confmgr.c                   | 2 +-
 src/test/test_confparse.c                 | 2 +-
 src/test/test_dir.c                       | 2 +-
 src/test/test_entryconn.c                 | 2 +-
 src/test/test_entrynodes.c                | 2 +-
 src/test/test_helpers.c                   | 2 +-
 src/test/test_options.c                   | 2 +-
 src/test/test_pt.c                        | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index b4bccd935..bdfa547fd 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -61,7 +61,7 @@
 #define CONFIG_PRIVATE
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "app/config/statefile.h"
 #include "app/main/main.h"
 #include "app/main/subsysmgr.h"
diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c
index bcc06809b..552bd2c44 100644
--- a/src/app/config/statefile.c
+++ b/src/app/config/statefile.c
@@ -32,7 +32,7 @@
 #include "core/or/or.h"
 #include "core/or/circuitstats.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "core/mainloop/mainloop.h"
 #include "core/mainloop/netstatus.h"
 #include "core/mainloop/connection.h"
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index ff809c01c..1daf46871 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -30,7 +30,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "core/crypto/hs_ntor.h"
 #include "core/crypto/onion_crypto.h"
 #include "core/crypto/onion_fast.h"
diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c
index 03eea1d77..7a7f3ca60 100644
--- a/src/core/or/circuitstats.c
+++ b/src/core/or/circuitstats.c
@@ -29,7 +29,7 @@
 #include "core/or/circuitbuild.h"
 #include "core/or/circuitstats.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "feature/control/control_events.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "core/mainloop/mainloop.h"
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 54a9238d8..c160c1641 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -114,7 +114,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "app/config/statefile.h"
 #include "core/mainloop/connection.h"
 #include "core/mainloop/mainloop.h"
diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
index ad4a4ef0a..a1d7f825d 100644
--- a/src/feature/control/control_cmd.c
+++ b/src/feature/control/control_cmd.c
@@ -13,7 +13,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "app/main/main.h"
 #include "core/mainloop/connection.h"
 #include "core/or/circuitbuild.h"
diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c
index 5ccf1a95e..a45f0a29c 100644
--- a/src/feature/dirauth/shared_random.c
+++ b/src/feature/dirauth/shared_random.c
@@ -90,7 +90,7 @@
 #include "core/or/or.h"
 #include "feature/dirauth/shared_random.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "feature/nodelist/networkstatus.h"
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
index f2a626c73..76befb0f5 100644
--- a/src/feature/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
@@ -12,7 +12,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "feature/dirauth/dirvote.h"
 #include "feature/nodelist/networkstatus.h"
diff --git a/src/feature/hs/hs_dos.c b/src/feature/hs/hs_dos.c
index 0ae36017f..19794e09d 100644
--- a/src/feature/hs/hs_dos.c
+++ b/src/feature/hs/hs_dos.c
@@ -29,7 +29,7 @@
 
 #include "lib/evloop/token_bucket.h"
 
-#include "hs_dos.h"
+#include "feature/hs/hs_dos.h"
 
 /* Default value of the allowed INTRODUCE2 cell rate per second. Above that
  * value per second, the introduction is denied. */
diff --git a/src/lib/confmgt/confparse.c b/src/lib/confmgt/confparse.c
index 9f7fdc5c3..08e562f65 100644
--- a/src/lib/confmgt/confparse.c
+++ b/src/lib/confmgt/confparse.c
@@ -23,7 +23,7 @@
 
 #define CONFPARSE_PRIVATE
 #include "orconfig.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 
 #include "lib/confmgt/structvar.h"
 #include "lib/confmgt/unitparse.h"
diff --git a/src/test/test_btrack.c b/src/test/test_btrack.c
index 21e88a57b..80da7829a 100644
--- a/src/test/test_btrack.c
+++ b/src/test/test_btrack.c
@@ -4,7 +4,7 @@
 #include "core/or/or.h"
 
 #include "test/test.h"
-#include "test_helpers.h"
+#include "test/test_helpers.h"
 #include "test/log_test_helpers.h"
 
 #define OCIRC_EVENT_PRIVATE
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 9b715b2ec..78f9ae9c3 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -16,7 +16,7 @@
 #include "core/or/circuitmux_ewma.h"
 #include "core/or/circuitbuild.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "test/test.h"
diff --git a/src/test/test_confmgr.c b/src/test/test_confmgr.c
index 5f73d9754..d5c73b48e 100644
--- a/src/test/test_confmgr.c
+++ b/src/test/test_confmgr.c
@@ -13,7 +13,7 @@
 
 #include "core/or/or.h"
 #include "lib/encoding/confline.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 
diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c
index bd2b5cdf1..d929d1e36 100644
--- a/src/test/test_confparse.c
+++ b/src/test/test_confparse.c
@@ -14,7 +14,7 @@
 #include "core/or/or.h"
 #include "lib/encoding/confline.h"
 #include "feature/nodelist/routerset.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 17d6db1e4..6329ff775 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -26,7 +26,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "core/mainloop/connection.h"
 #include "core/or/relay.h"
 #include "core/or/versions.h"
diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c
index fc7c5d580..8f2d50774 100644
--- a/src/test/test_entryconn.c
+++ b/src/test/test_entryconn.c
@@ -11,7 +11,7 @@
 
 #include "feature/client/addressmap.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "feature/nodelist/nodelist.h"
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index c8dd4b03e..f53a360eb 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -18,7 +18,7 @@
 #include "core/or/circuitlist.h"
 #include "core/or/circuitbuild.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "feature/dircommon/directory.h"
 #include "feature/dirclient/dirclient.h"
diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 31a6540ef..8eb3c2c92 100644
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -16,7 +16,7 @@
 
 #include "lib/buf/buffers.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "app/main/subsysmgr.h"
 #include "core/mainloop/connection.h"
 #include "lib/crypt_ops/crypto_rand.h"
diff --git a/src/test/test_options.c b/src/test/test_options.c
index a6bccdc52..0747a2e06 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -5,7 +5,7 @@
 
 #define CONFIG_PRIVATE
 #include "core/or/or.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "app/config/config.h"
 #include "test/test.h"
 #include "lib/geoip/geoip.h"
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index 362c6664d..8f3ce03c4 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -11,7 +11,7 @@
 #define PROCESS_PRIVATE
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "app/config/confparse.h"
+#include "lib/confmgt/confparse.h"
 #include "feature/control/control.h"
 #include "feature/control/control_events.h"
 #include "feature/client/transports.h"





More information about the tor-commits mailing list