[tor-commits] [tor/master] Rectify include paths (automated)
nickm at torproject.org
nickm at torproject.org
Thu Jun 21 17:57:19 UTC 2018
commit b420da4cf80e9fc53db0a085514b9491b750812f
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jun 21 11:52:01 2018 -0400
Rectify include paths (automated)
---
src/common/buffers.c | 2 +-
src/common/buffers_tls.c | 2 +-
src/lib/compress/compress.c | 10 +++++-----
src/lib/compress/compress_lzma.c | 4 ++--
src/lib/compress/compress_none.c | 4 ++--
src/lib/compress/compress_zlib.c | 4 ++--
src/lib/compress/compress_zstd.c | 4 ++--
src/or/circuitlist.c | 6 +++---
src/or/config.c | 2 +-
src/or/main.c | 2 +-
src/or/or.h | 2 +-
src/or/relay.c | 2 +-
src/test/test.c | 2 +-
src/test/test_dir_handle_get.c | 2 +-
src/test/test_util.c | 2 +-
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/common/buffers.c b/src/common/buffers.c
index 997bbdccc..fd029c26c 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -23,7 +23,7 @@
#include <stddef.h>
#include "common/buffers.h"
#include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "common/util.h"
#include "common/torint.h"
#include "common/torlog.h"
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index dfc8e44b9..c380369b5 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -10,7 +10,7 @@
#include "common/buffers.h"
#include "common/buffers_tls.h"
#include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "common/util.h"
#include "common/torint.h"
#include "common/torlog.h"
diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index 44bb891af..0d0c8112e 100644
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -21,11 +21,11 @@
#include "common/util.h"
#include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
-#include "common/compress_none.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_none.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
/** Total number of bytes allocated for compression state overhead. */
static atomic_counter_t total_compress_allocation;
diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 363dc1fb9..921aaa1d7 100644
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -15,8 +15,8 @@
#include "common/util.h"
#include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
#ifdef HAVE_LZMA
#include <lzma.h>
diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c
index 7e67046d3..05a27e5cc 100644
--- a/src/lib/compress/compress_none.c
+++ b/src/lib/compress/compress_none.c
@@ -18,8 +18,8 @@
#include "common/util.h"
#include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_none.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_none.h"
/** Transfer some bytes using the identity transformation. Read up to
* *<b>in_len</b> bytes from *<b>in</b>, and write up to *<b>out_len</b> bytes
diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c
index 663e27f79..56dda8a2d 100644
--- a/src/lib/compress/compress_zlib.c
+++ b/src/lib/compress/compress_zlib.c
@@ -15,8 +15,8 @@
#include "common/util.h"
#include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zlib.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zlib.h"
/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of
saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c
index dc0dcdec9..37204ab5e 100644
--- a/src/lib/compress/compress_zstd.c
+++ b/src/lib/compress/compress_zstd.c
@@ -15,8 +15,8 @@
#include "common/util.h"
#include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zstd.h"
#ifdef ENABLE_ZSTD_ADVANCED_APIS
/* This is a lie, but we make sure it doesn't get us in trouble by wrapping
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index c3d017bf8..1af970040 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -86,9 +86,9 @@
#include "or/routerlist.h"
#include "or/routerset.h"
#include "or/channelpadding.h"
-#include "common/compress_lzma.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
#include "ht.h"
diff --git a/src/or/config.c b/src/or/config.c
index 8c6e2382f..37e6a6f92 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -70,7 +70,7 @@
#include "or/circuitmux.h"
#include "or/circuitmux_ewma.h"
#include "or/circuitstats.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "or/config.h"
#include "or/connection.h"
#include "or/connection_edge.h"
diff --git a/src/or/main.c b/src/or/main.c
index 4ca180af2..35d6d62bb 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -61,7 +61,7 @@
#include "or/circuituse.h"
#include "or/circuitmux_ewma.h"
#include "or/command.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "or/config.h"
#include "or/confparse.h"
#include "or/connection.h"
diff --git a/src/or/or.h b/src/or/or.h
index 55364beee..66e69f3ca 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -70,7 +70,7 @@
#include "common/tortls.h"
#include "common/torlog.h"
#include "common/container.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "common/address.h"
#include "common/compat_libevent.h"
#include "ht.h"
diff --git a/src/or/relay.c b/src/or/relay.c
index 8a97d72f9..230d14130 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -55,7 +55,7 @@
#include "or/circuitbuild.h"
#include "or/circuitlist.h"
#include "or/circuituse.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "or/config.h"
#include "or/connection.h"
#include "or/connection_edge.h"
diff --git a/src/test/test.c b/src/test/test.c
index 8bdeb60bd..2bf91cca8 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -44,7 +44,7 @@ double fabs(double x);
#include "common/buffers.h"
#include "or/circuitlist.h"
#include "or/circuitstats.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "or/config.h"
#include "or/connection_edge.h"
#include "or/rendcommon.h"
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index fbc14e3d3..90ca7d357 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -15,7 +15,7 @@
#include "or/consdiffmgr.h"
#include "or/directory.h"
#include "test/test.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
#include "or/rendcommon.h"
#include "or/rendcache.h"
#include "or/router.h"
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 4d06e3e7c..4e0fccdff 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -17,7 +17,7 @@
#include "common/memarea.h"
#include "common/util_process.h"
#include "test/log_test_helpers.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress_zstd.h"
#ifdef HAVE_PWD_H
#include <pwd.h>
More information about the tor-commits
mailing list