[tor-commits] [tor/master] Code Style: Delete headers that are included twice
teor at torproject.org
teor at torproject.org
Thu Dec 19 23:55:36 UTC 2019
commit cd160291a755ac830855e3226e6c470a5b2ecede
Author: teor <teor at torproject.org>
Date: Tue Nov 26 09:10:32 2019 +1000
Code Style: Delete headers that are included twice
These changes were created using the "make autostyle" from
32522, and then split into commits.
---
src/app/main/main.c | 1 -
src/app/main/shutdown.c | 1 -
src/core/mainloop/periodic.c | 1 -
src/core/or/or.h | 1 -
src/core/or/scheduler.c | 1 -
src/feature/dirauth/keypin.c | 2 --
src/feature/hs/hs_service.c | 1 -
src/lib/confmgt/type_defs.c | 1 -
src/lib/crypt_ops/aes_openssl.c | 1 -
src/lib/process/env.c | 1 -
src/test/test_circuitpadding.c | 1 -
src/test/test_hs_control.c | 2 --
src/test/test_relay.c | 1 -
src/test/test_relaycell.c | 1 -
14 files changed, 16 deletions(-)
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 6029ed3d2..4275a98bd 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -67,7 +67,6 @@
#include "lib/osinfo/uname.h"
#include "lib/sandbox/sandbox.h"
#include "lib/fs/lockfile.h"
-#include "lib/net/resolve.h"
#include "lib/tls/tortls.h"
#include "lib/evloop/compat_libevent.h"
#include "lib/encoding/confline.h"
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c
index cc07b921c..df273b960 100644
--- a/src/app/main/shutdown.c
+++ b/src/app/main/shutdown.c
@@ -43,7 +43,6 @@
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h"
-#include "feature/nodelist/routerlist.h"
#include "feature/relay/ext_orport.h"
#include "feature/relay/relay_config.h"
#include "feature/rend/rendcache.h"
diff --git a/src/core/mainloop/periodic.c b/src/core/mainloop/periodic.c
index efc6a6316..490d23c24 100644
--- a/src/core/mainloop/periodic.c
+++ b/src/core/mainloop/periodic.c
@@ -29,7 +29,6 @@
#include "app/config/config.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/periodic.h"
-#include "lib/evloop/compat_libevent.h"
/** We disable any interval greater than this number of seconds, on the
* grounds that it is probably an absolute time mistakenly passed in as a
diff --git a/src/core/or/or.h b/src/core/or/or.h
index c044936d3..4d6afc2b0 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -24,7 +24,6 @@
#include "lib/arch/bytes.h"
#include "lib/cc/compat_compiler.h"
-#include "lib/cc/torint.h"
#include "lib/container/map.h"
#include "lib/buf/buffers.h"
#include "lib/container/smartlist.h"
diff --git a/src/core/or/scheduler.c b/src/core/or/scheduler.c
index 063342480..5b1cd90ae 100644
--- a/src/core/or/scheduler.c
+++ b/src/core/or/scheduler.c
@@ -12,7 +12,6 @@
#include "lib/buf/buffers.h"
#define TOR_CHANNEL_INTERNAL_
#include "core/or/channeltls.h"
-#include "lib/evloop/compat_libevent.h"
#include "core/or/or_connection_st.h"
diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c
index 3ca2c3ef9..991b7be03 100644
--- a/src/feature/dirauth/keypin.c
+++ b/src/feature/dirauth/keypin.c
@@ -15,8 +15,6 @@
#include "lib/cc/torint.h"
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/crypt_ops/crypto_format.h"
-#include "lib/crypt_ops/crypto_format.h"
-#include "lib/ctime/di_ops.h"
#include "lib/ctime/di_ops.h"
#include "lib/encoding/binascii.h"
#include "lib/encoding/time_fmt.h"
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 3d152afa1..cfa5d6c6e 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -30,7 +30,6 @@
#include "feature/rend/rendservice.h"
#include "lib/crypt_ops/crypto_ope.h"
#include "lib/crypt_ops/crypto_rand.h"
-#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/hs/hs_circuit.h"
diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c
index 7200218f7..00932511a 100644
--- a/src/lib/confmgt/type_defs.c
+++ b/src/lib/confmgt/type_defs.c
@@ -23,7 +23,6 @@
#include "lib/confmgt/unitparse.h"
#include "lib/cc/compat_compiler.h"
-#include "lib/conf/conftypes.h"
#include "lib/container/smartlist.h"
#include "lib/encoding/confline.h"
#include "lib/encoding/time_fmt.h"
diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c
index d493b1846..f5cc97ff6 100644
--- a/src/lib/crypt_ops/aes_openssl.c
+++ b/src/lib/crypt_ops/aes_openssl.c
@@ -39,7 +39,6 @@ DISABLE_GCC_WARNING(redundant-decls)
ENABLE_GCC_WARNING(redundant-decls)
-#include "lib/crypt_ops/aes.h"
#include "lib/log/log.h"
#include "lib/ctime/di_ops.h"
diff --git a/src/lib/process/env.c b/src/lib/process/env.c
index 3912ade19..88619d1e4 100644
--- a/src/lib/process/env.c
+++ b/src/lib/process/env.c
@@ -16,7 +16,6 @@
#include "lib/container/smartlist.h"
#include "lib/log/util_bug.h"
#include "lib/log/log.h"
-#include "lib/malloc/malloc.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c
index 70e2081c5..78a019de8 100644
--- a/src/test/test_circuitpadding.c
+++ b/src/test/test_circuitpadding.c
@@ -27,7 +27,6 @@
#include "core/crypto/relay_crypto.h"
#include "core/or/protover.h"
#include "feature/nodelist/nodelist.h"
-#include "lib/evloop/compat_libevent.h"
#include "app/config/config.h"
#include "feature/nodelist/routerstatus_st.h"
diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c
index dab0a8c60..789072430 100644
--- a/src/test/test_hs_control.c
+++ b/src/test/test_hs_control.c
@@ -28,8 +28,6 @@
#include "feature/nodelist/routerstatus_st.h"
#include "lib/crypt_ops/crypto_format.h"
-#include "test/test_helpers.h"
-
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index f7809b47e..5c95f9fe1 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -10,7 +10,6 @@
#include "core/or/channeltls.h"
#include "feature/stats/rephist.h"
#include "core/or/relay.h"
-#include "feature/stats/rephist.h"
#include "lib/container/order.h"
/* For init/free stuff */
#include "core/or/scheduler.h"
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c
index c65279fb2..14bd045df 100644
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -30,7 +30,6 @@
#include "core/or/half_edge_st.h"
#include "feature/client/circpathbias.h"
-#include "core/or/connection_edge.h"
static int srm_ncalls;
static entry_connection_t *srm_conn;
More information about the tor-commits
mailing list