From 04583df4520705bc171be9b720344167029292cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= Date: Tue, 18 Apr 2017 03:21:53 +0200 Subject: [PATCH] Rename the `torgzip` module to `compress`. See https://bugs.torproject.org/21663 --- src/common/Makefile.nmake | 2 +- src/common/{torgzip.c => compress.c} | 6 +++--- src/common/{torgzip.h => compress.h} | 10 +++++----- src/common/compress_zlib.c | 2 +- src/common/include.am | 4 ++-- src/or/config.c | 2 +- src/or/or.h | 2 +- src/test/test.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename src/common/{torgzip.c => compress.c} (98%) rename src/common/{torgzip.h => compress.h} (94%) diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index b8c5dd4fea..8667959b52 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -7,7 +7,7 @@ LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \ log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \ util_codedigest.obj -LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj torgzip.obj tortls.obj \ +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj compress.obj tortls.obj \ crypto_curve25519.obj curve25519-donna.obj LIBOR_EVENT_OBJECTS = compat_libevent.obj diff --git a/src/common/torgzip.c b/src/common/compress.c similarity index 98% rename from src/common/torgzip.c rename to src/common/compress.c index d760cd9546..74e235f006 100644 --- a/src/common/torgzip.c +++ b/src/common/compress.c @@ -4,8 +4,8 @@ /* See LICENSE for licensing information */ /** - * \file torgzip.c - * \brief A simple in-memory gzip implementation. + * \file compress.c + * \brief Common compression API. **/ #include "orconfig.h" @@ -22,7 +22,7 @@ #include "util.h" #include "torlog.h" -#include "torgzip.h" +#include "compress.h" #include "compress_zlib.h" /** @{ */ diff --git a/src/common/torgzip.h b/src/common/compress.h similarity index 94% rename from src/common/torgzip.h rename to src/common/compress.h index 0fcac0c946..c347e1c184 100644 --- a/src/common/torgzip.h +++ b/src/common/compress.h @@ -4,12 +4,12 @@ /* See LICENSE for licensing information */ /** - * \file torgzip.h - * \brief Headers for torgzip.h + * \file compress.h + * \brief Headers for compress.c **/ -#ifndef TOR_TORGZIP_H -#define TOR_TORGZIP_H +#ifndef TOR_COMPRESS_H +#define TOR_COMPRESS_H /** Enumeration of what kind of compression to use. Only ZLIB_METHOD and * GZIP_METHOD is guaranteed to be supported by the compress/uncompress @@ -70,5 +70,5 @@ void tor_compress_free(tor_compress_state_t *state); size_t tor_compress_state_size(const tor_compress_state_t *state); -#endif +#endif // TOR_COMPRESS_H. diff --git a/src/common/compress_zlib.c b/src/common/compress_zlib.c index 38e500c754..2c9aba32ee 100644 --- a/src/common/compress_zlib.c +++ b/src/common/compress_zlib.c @@ -15,7 +15,7 @@ #include "util.h" #include "torlog.h" -#include "torgzip.h" +#include "compress.h" #include "compress_zlib.h" /* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of diff --git a/src/common/include.am b/src/common/include.am index ea2c46a670..7ed75d9495 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -105,12 +105,12 @@ src/common/src_common_libor_testing_a-log.$(OBJEXT) \ LIBOR_CRYPTO_A_SRC = \ src/common/aes.c \ + src/common/compress.c \ src/common/compress_zlib.c \ src/common/crypto.c \ src/common/crypto_pwbox.c \ src/common/crypto_s2k.c \ src/common/crypto_format.c \ - src/common/torgzip.c \ src/common/tortls.c \ src/common/crypto_curve25519.c \ src/common/crypto_ed25519.c @@ -146,6 +146,7 @@ COMMONHEADERS = \ src/common/compat_openssl.h \ src/common/compat_threads.h \ src/common/compat_time.h \ + src/common/compress.h \ src/common/compress_zlib.h \ src/common/confline.h \ src/common/container.h \ @@ -165,7 +166,6 @@ COMMONHEADERS = \ src/common/storagedir.h \ src/common/testsupport.h \ src/common/timers.h \ - src/common/torgzip.h \ src/common/torint.h \ src/common/torlog.h \ src/common/tortls.h \ diff --git a/src/or/config.c b/src/or/config.c index 83e5f2106c..9af116db1c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -69,6 +69,7 @@ #include "circuitmux.h" #include "circuitmux_ewma.h" #include "circuitstats.h" +#include "compress.h" #include "compress_zlib.h" #include "config.h" #include "connection.h" @@ -100,7 +101,6 @@ #include "statefile.h" #include "transports.h" #include "ext_orport.h" -#include "torgzip.h" #ifdef _WIN32 #include #endif diff --git a/src/or/or.h b/src/or/or.h index 20c4ebccd0..9e3e409af9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -71,7 +71,7 @@ #include "tortls.h" #include "torlog.h" #include "container.h" -#include "torgzip.h" +#include "compress.h" #include "address.h" #include "compat_libevent.h" #include "ht.h" diff --git a/src/test/test.c b/src/test/test.c index 77ea44970c..e8a63e6afd 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -44,13 +44,13 @@ double fabs(double x); #include "buffers.h" #include "circuitlist.h" #include "circuitstats.h" +#include "compress.h" #include "config.h" #include "connection_edge.h" #include "geoip.h" #include "rendcommon.h" #include "rendcache.h" #include "test.h" -#include "torgzip.h" #include "main.h" #include "memarea.h" #include "onion.h" diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index ed8ea2f809..392fa4dde0 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -14,6 +14,7 @@ #include "connection.h" #include "directory.h" #include "test.h" +#include "compress.h" #include "connection.h" #include "rendcommon.h" #include "rendcache.h" @@ -28,7 +29,6 @@ #include "networkstatus.h" #include "geoip.h" #include "dirserv.h" -#include "torgzip.h" #include "dirvote.h" #include "log_test_helpers.h"