commit 22e6ad6f269a7672418b97c31d3d3c1e4ee795c7 Author: Alexander Færøy ahf@torproject.org Date: Thu Apr 27 03:36:02 2017 +0200

Clean up mentions of 'zlib' and rename the mentions to 'compressed'.

This patch cleans up in various places where 'zlib' is mentioned. --- src/test/fuzz/fuzz_http.c | 4 ++-- src/test/test_extorport.c | 4 ++-- src/test/test_helpers.c | 4 ++-- src/test/test_helpers.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index ce52acf..2ffeb60 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -18,10 +18,10 @@

static void mock_connection_write_to_buf_impl_(const char *string, size_t len, - connection_t *conn, int zlib) + connection_t *conn, int compressed) { log_debug(LD_GENERAL, "%sResponse:\n%u\nConnection: %p\n%s\n", - zlib ? "Compressed " : "", (unsigned)len, conn, string); + compressed ? "Compressed " : "", (unsigned)len, conn, string); }

static int diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 965e182..fc9f27a 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -72,9 +72,9 @@ test_ext_or_id_map(void *arg) * writes to outbuf. */ static void connection_write_to_buf_impl_replacement(const char *string, size_t len, - connection_t *conn, int zlib) + connection_t *conn, int compressed) { - (void) zlib; + (void) compressed;

tor_assert(string); tor_assert(conn); diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index a894336..9fada5a 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -98,9 +98,9 @@ helper_setup_fake_routerlist(void)

void connection_write_to_buf_mock(const char *string, size_t len, - connection_t *conn, int zlib) + connection_t *conn, int compressed) { - (void) zlib; + (void) compressed;

tor_assert(string); tor_assert(conn); diff --git a/src/test/test_helpers.h b/src/test/test_helpers.h index 293f80d..4621631 100644 --- a/src/test/test_helpers.h +++ b/src/test/test_helpers.h @@ -15,7 +15,7 @@ void helper_setup_fake_routerlist(void);

#define GET(path) "GET " path " HTTP/1.0\r\n\r\n" void connection_write_to_buf_mock(const char *string, size_t len, - connection_t *conn, int zlib); + connection_t *conn, int compressed);

int mock_tor_addr_lookup__fail_on_bad_addrs(const char *name, uint16_t family, tor_addr_t *out);