Rename zlib_compression_level_t to compression_level_t.

See https://bugs.torproject.org/21663
This commit is contained in:
Alexander Færøy
2017-04-17 14:22:13 +02:00
parent 7460b9755a
commit e8b025dfc3
4 changed files with 7 additions and 7 deletions
+3 -3
View File
@@ -74,7 +74,7 @@ tor_zlib_get_header_version_str(void)
/** Return the 'bits' value to tell zlib to use <b>method</b>.*/
static inline int
method_bits(compress_method_t method, zlib_compression_level_t level)
method_bits(compress_method_t method, compression_level_t level)
{
/* Bits+16 means "use gzip" in zlib >= 1.2 */
const int flag = method == GZIP_METHOD ? 16 : 0;
@@ -87,7 +87,7 @@ method_bits(compress_method_t method, zlib_compression_level_t level)
}
static inline int
get_memlevel(zlib_compression_level_t level)
get_memlevel(compression_level_t level)
{
switch (level) {
default:
@@ -419,7 +419,7 @@ struct tor_zlib_state_t {
* decompression. */
tor_zlib_state_t *
tor_zlib_new(int compress_, compress_method_t method,
zlib_compression_level_t compression_level)
compression_level_t compression_level)
{
tor_zlib_state_t *out;
int bits, memlevel;
+2 -2
View File
@@ -25,7 +25,7 @@ typedef enum {
**/
typedef enum {
HIGH_COMPRESSION, MEDIUM_COMPRESSION, LOW_COMPRESSION
} zlib_compression_level_t;
} compression_level_t;
int
tor_gzip_compress(char **out, size_t *out_len,
@@ -54,7 +54,7 @@ typedef enum {
/** Internal state for an incremental zlib compression/decompression. */
typedef struct tor_zlib_state_t tor_zlib_state_t;
tor_zlib_state_t *tor_zlib_new(int compress, compress_method_t method,
zlib_compression_level_t level);
compression_level_t level);
tor_zlib_output_t tor_zlib_process(tor_zlib_state_t *state,
char **out, size_t *out_len,
+1 -1
View File
@@ -2845,7 +2845,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url)
/** Return the compression level we should use for sending a compressed
* response of size <b>n_bytes</b>. */
STATIC zlib_compression_level_t
STATIC compression_level_t
choose_compression_level(ssize_t n_bytes)
{
if (! have_been_under_memory_pressure()) {
+1 -1
View File
@@ -181,7 +181,7 @@ STATIC int handle_post_hs_descriptor(const char *url, const char *body);
STATIC char* authdir_type_to_string(dirinfo_type_t auth);
STATIC const char * dir_conn_purpose_to_string(int purpose);
STATIC int should_use_directory_guards(const or_options_t *options);
STATIC zlib_compression_level_t choose_compression_level(ssize_t n_bytes);
STATIC compression_level_t choose_compression_level(ssize_t n_bytes);
STATIC const smartlist_t *find_dl_schedule(download_status_t *dls,
const or_options_t *options);
STATIC void find_dl_min_and_max_delay(download_status_t *dls,