diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-20 10:14:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-20 10:14:15 -0500 |
| commit | 4438ef3288256e1f1ba706c157206a2ac190781d (patch) | |
| tree | 3515fdc2c6f7b258c9fa81bb191e6bff90ecb66d /src/or | |
| parent | a4ab273a0dafdd85e8e9f204c6e3e092282d3620 (diff) | |
| download | tor-4438ef3288256e1f1ba706c157206a2ac190781d.tar.gz tor-4438ef3288256e1f1ba706c157206a2ac190781d.zip | |
Remove a bunch of other redundant #includes
Folks have found two in the past week or so; we may as well fix the
others.
Found with:
\#!/usr/bin/python3
import re
def findMulti(fname):
includes = set()
with open(fname) as f:
for line in f:
m = re.match(r'^\s*#\s*include\s+["<](\S+)[>"]', line)
if m:
inc = m.group(1)
if inc in includes:
print("{}: {}".format(fname, inc))
includes.add(m.group(1))
import sys
for fname in sys.argv[1:]:
findMulti(fname)
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuituse.c | 1 | ||||
| -rw-r--r-- | src/or/hs_client.c | 2 | ||||
| -rw-r--r-- | src/or/hs_common.c | 1 | ||||
| -rw-r--r-- | src/or/hs_intropoint.c | 1 | ||||
| -rw-r--r-- | src/or/hs_service.c | 1 | ||||
| -rw-r--r-- | src/or/rephist.c | 1 | ||||
| -rw-r--r-- | src/or/status.c | 1 |
7 files changed, 0 insertions, 8 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 13bd84e65c..8d388cc2c6 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -55,7 +55,6 @@ #include "rephist.h" #include "router.h" #include "routerlist.h" -#include "config.h" static void circuit_expire_old_circuits_clientside(void); static void circuit_increment_failure_count(void); diff --git a/src/or/hs_client.c b/src/or/hs_client.c index d3d13723e4..20963cd453 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -17,7 +17,6 @@ #include "hs_descriptor.h" #include "hs_cache.h" #include "hs_cell.h" -#include "hs_ident.h" #include "config.h" #include "directory.h" #include "hs_client.h" @@ -29,7 +28,6 @@ #include "connection.h" #include "nodelist.h" #include "circpathbias.h" -#include "connection.h" #include "hs_ntor.h" #include "circuitbuild.h" #include "networkstatus.h" diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 6d97c8775c..aa34b0e8fb 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -28,7 +28,6 @@ #include "rendservice.h" #include "routerset.h" #include "router.h" -#include "routerset.h" #include "shared_random.h" #include "shared_random_state.h" diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 8c6453e6fd..3274e8e9c0 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -12,7 +12,6 @@ #include "config.h" #include "circuitlist.h" #include "circuituse.h" -#include "config.h" #include "relay.h" #include "rendmid.h" #include "rephist.h" diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 8ae00df48e..220d3f5157 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -31,7 +31,6 @@ #include "hs_common.h" #include "hs_config.h" #include "hs_control.h" -#include "hs_circuit.h" #include "hs_descriptor.h" #include "hs_ident.h" #include "hs_intropoint.h" diff --git a/src/or/rephist.c b/src/or/rephist.c index 43494692cb..ac3e9f502e 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -86,7 +86,6 @@ #include "ht.h" #include "channelpadding.h" -#include "channelpadding.h" #include "connection_or.h" static void bw_arrays_init(void); diff --git a/src/or/status.c b/src/or/status.c index 4f7be164b1..4c497739e8 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -25,7 +25,6 @@ #include "main.h" #include "rephist.h" #include "hibernate.h" -#include "rephist.h" #include "statefile.h" #include "hs_stats.h" #include "hs_service.h" |