nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.1'

Browse Source
This commit is contained in:
Nick Mathewson 2017-06-20 13:35:44 -04:00
commit a9a76aa6ae
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/compress.c
View File

@ -105,8 +105,8 @@ tor_compress_impl(int compress,
if (stream == NULL) { if (stream == NULL) {
log_warn(LD_GENERAL, "NULL stream while %scompressing", log_warn(LD_GENERAL, "NULL stream while %scompressing",
compress?"":"de"); compress?"":"de");
log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", log_debug(LD_GENERAL, "method: %d level: %d at len: %lu",
method, compression_level, in_len); method, compression_level, (unsigned long)in_len);
return -1; return -1;
} }
@ -146,15 +146,15 @@ tor_compress_impl(int compress,
"Unexpected %s while %scompressing", "Unexpected %s while %scompressing",
complete_only?"end of input":"result", complete_only?"end of input":"result",
compress?"":"de"); compress?"":"de");
log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", log_debug(LD_GENERAL, "method: %d level: %d at len: %lu",
method, compression_level, in_len); method, compression_level, (unsigned long)in_len);
goto err; goto err;
} else { } else {
if (in_len != 0) { if (in_len != 0) {
log_fn(protocol_warn_level, LD_PROTOCOL, log_fn(protocol_warn_level, LD_PROTOCOL,
"Unexpected extra input while decompressing"); "Unexpected extra input while decompressing");
log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", log_debug(LD_GENERAL, "method: %d level: %d at len: %lu",
method, compression_level, in_len); method, compression_level, (unsigned long)in_len);
goto err; goto err;
} else { } else {
goto done; goto done;

2
src/common/compress_none.c
View File

@ -4,7 +4,7 @@
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
/** /**
* \file compress_lzma.c * \file compress_none.c
* \brief Compression backend for identity compression. * \brief Compression backend for identity compression.
* *
* We actually define this backend so that we can treat the identity transform * We actually define this backend so that we can treat the identity transform