nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 00:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some LCOV_EXCL stuff that I think may be testable after all.

Browse Source 
This is partial revert on 22286.

Also, tweak some log messages to be distinct.
This commit is contained in:
Nick Mathewson 2017-08-08 10:08:06 -04:00
parent 6121ca16bc
commit 7465ea4ad9
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/compress_lzma.c
View File

@ -46,7 +46,6 @@ memory_level(compression_level_t level)
static const char * static const char *
lzma_error_str(lzma_ret error) lzma_error_str(lzma_ret error)
{ {
// LCOV_EXCL_START
switch (error) { switch (error) {
case LZMA_OK: case LZMA_OK:
return "Operation completed successfully"; return "Operation completed successfully";
@ -75,7 +74,6 @@ lzma_error_str(lzma_ret error)
default: default:
return "Unknown LZMA error"; return "Unknown LZMA error";
} }
// LCOV_EXCL_STOP
} }
#endif // HAVE_LZMA. #endif // HAVE_LZMA.
@ -303,12 +301,10 @@ tor_lzma_compress_process(tor_lzma_compress_state_t *state,
case LZMA_DATA_ERROR: case LZMA_DATA_ERROR:
case LZMA_PROG_ERROR: case LZMA_PROG_ERROR:
default: default:
// LCOV_EXCL_START
log_warn(LD_GENERAL, "LZMA %s didn't finish: %s.", log_warn(LD_GENERAL, "LZMA %s didn't finish: %s.",
state->compress ? "compression" : "decompression", state->compress ? "compression" : "decompression",
lzma_error_str(retval)); lzma_error_str(retval));
return TOR_COMPRESS_ERROR; return TOR_COMPRESS_ERROR;
// LCOV_EXCL_STOP
} }
#else // HAVE_LZMA. #else // HAVE_LZMA.
(void)state; (void)state;

12
src/common/compress_zstd.c
View File

@ -197,7 +197,8 @@ tor_zstd_compress_new(int compress,
if (result->u.compress_stream == NULL) { if (result->u.compress_stream == NULL) {
// LCOV_EXCL_START // LCOV_EXCL_START
log_warn(LD_GENERAL, "Error while creating Zstandard stream"); log_warn(LD_GENERAL, "Error while creating Zstandard compression "
"stream");
goto err; goto err;
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
} }
@ -216,7 +217,8 @@ tor_zstd_compress_new(int compress,
if (result->u.decompress_stream == NULL) { if (result->u.decompress_stream == NULL) {
// LCOV_EXCL_START // LCOV_EXCL_START
log_warn(LD_GENERAL, "Error while creating Zstandard stream"); log_warn(LD_GENERAL, "Error while creating Zstandard decompression "
"stream");
goto err; goto err;
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
} }
@ -313,12 +315,10 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state,
} }
if (ZSTD_isError(retval)) { if (ZSTD_isError(retval)) {
// LCOV_EXCL_START
log_warn(LD_GENERAL, "Zstandard %s didn't finish: %s.", log_warn(LD_GENERAL, "Zstandard %s didn't finish: %s.",
state->compress ? "compression" : "decompression", state->compress ? "compression" : "decompression",
ZSTD_getErrorName(retval)); ZSTD_getErrorName(retval));
return TOR_COMPRESS_ERROR; return TOR_COMPRESS_ERROR;
// LCOV_EXCL_STOP
} }
if (state->compress && !state->have_called_end) { if (state->compress && !state->have_called_end) {
@ -328,11 +328,9 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state,
*out_len = output.size - output.pos; *out_len = output.size - output.pos;
if (ZSTD_isError(retval)) { if (ZSTD_isError(retval)) {
// LCOV_EXCL_START
log_warn(LD_GENERAL, "Zstandard compression unable to flush: %s.", log_warn(LD_GENERAL, "Zstandard compression unable to flush: %s.",
ZSTD_getErrorName(retval)); ZSTD_getErrorName(retval));
return TOR_COMPRESS_ERROR; return TOR_COMPRESS_ERROR;
// LCOV_EXCL_STOP
} }
// ZSTD_flushStream returns 0 if the frame is done, or >0 if it // ZSTD_flushStream returns 0 if the frame is done, or >0 if it
@ -359,12 +357,10 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state,
*out_len = output.size - output.pos; *out_len = output.size - output.pos;
if (ZSTD_isError(retval)) { if (ZSTD_isError(retval)) {
// LCOV_EXCL_START
log_warn(LD_GENERAL, "Zstandard compression unable to write " log_warn(LD_GENERAL, "Zstandard compression unable to write "
"epilogue: %s.", "epilogue: %s.",
ZSTD_getErrorName(retval)); ZSTD_getErrorName(retval));
return TOR_COMPRESS_ERROR; return TOR_COMPRESS_ERROR;
// LCOV_EXCL_STOP
} }
// endStream returns the number of bytes that is needed to write the // endStream returns the number of bytes that is needed to write the