summaryrefslogtreecommitdiff
path: root/src/common/compress.h
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2017-04-25 03:36:30 +0200
committerNick Mathewson <nickm@torproject.org>2017-04-25 08:11:32 -0400
commit2210b330e757d234346191e5d05af761fe8561e6 (patch)
tree9582f272238f17475d907b07ff5cf985b4b7457b /src/common/compress.h
parentcf912259ba491e51f6f211e186ff67605ff269c8 (diff)
downloadtor-2210b330e757d234346191e5d05af761fe8561e6.tar.gz
tor-2210b330e757d234346191e5d05af761fe8561e6.zip
Fix newlines in compression headers.
See: https://bugs.torproject.org/21662
Diffstat (limited to 'src/common/compress.h')
-rw-r--r--src/common/compress.h34
1 files changed, 14 insertions, 20 deletions
diff --git a/src/common/compress.h b/src/common/compress.h
index 1e6e9fd329..2d812e4430 100644
--- a/src/common/compress.h
+++ b/src/common/compress.h
@@ -33,33 +33,27 @@ typedef enum {
HIGH_COMPRESSION, MEDIUM_COMPRESSION, LOW_COMPRESSION
} compression_level_t;
-int
-tor_compress(char **out, size_t *out_len,
- const char *in, size_t in_len,
- compress_method_t method);
-int
-tor_uncompress(char **out, size_t *out_len,
- const char *in, size_t in_len,
- compress_method_t method,
- int complete_only,
- int protocol_warn_level);
+int tor_compress(char **out, size_t *out_len,
+ const char *in, size_t in_len,
+ compress_method_t method);
+
+int tor_uncompress(char **out, size_t *out_len,
+ const char *in, size_t in_len,
+ compress_method_t method,
+ int complete_only,
+ int protocol_warn_level);
compress_method_t detect_compression_method(const char *in, size_t in_len);
-int
-tor_compress_is_compression_bomb(size_t size_in, size_t size_out);
+int tor_compress_is_compression_bomb(size_t size_in, size_t size_out);
-int
-tor_compress_supports_method(compress_method_t method);
+int tor_compress_supports_method(compress_method_t method);
-const char *
-tor_compress_version_str(compress_method_t method);
+const char *tor_compress_version_str(compress_method_t method);
-const char *
-tor_compress_header_version_str(compress_method_t method);
+const char *tor_compress_header_version_str(compress_method_t method);
-size_t
-tor_compress_get_total_allocation(void);
+size_t tor_compress_get_total_allocation(void);
/** Return values from tor_compress_process; see that function's documentation
* for details. */