mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-09 20:53:45 +01:00
Merge branch 'maint-0.4.5' into release-0.4.5
This commit is contained in:
commit
380189d87f
2
changes/ticket40741
Normal file
2
changes/ticket40741
Normal file
@ -0,0 +1,2 @@
|
||||
o Minor feature (lzma):
|
||||
- Fix compiler warnings for liblzma >= 5.3.1. Closes ticket 40741.
|
@ -73,6 +73,23 @@ lzma_error_str(lzma_ret error)
|
||||
return "Unable to progress";
|
||||
case LZMA_PROG_ERROR:
|
||||
return "Programming error";
|
||||
#if LZMA_VERSION >= 50030010
|
||||
case LZMA_SEEK_NEEDED:
|
||||
// This can be returned by the .xz file_info decoder but with
|
||||
// lzma_alone_decoder/encoder as we use, it should never be seen.
|
||||
return "Seek needed";
|
||||
#endif
|
||||
#if LZMA_VERSION >= 50030020
|
||||
case LZMA_RET_INTERNAL1:
|
||||
case LZMA_RET_INTERNAL2:
|
||||
case LZMA_RET_INTERNAL3:
|
||||
case LZMA_RET_INTERNAL4:
|
||||
case LZMA_RET_INTERNAL5:
|
||||
case LZMA_RET_INTERNAL6:
|
||||
case LZMA_RET_INTERNAL7:
|
||||
case LZMA_RET_INTERNAL8:
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
default:
|
||||
return "Unknown LZMA error";
|
||||
}
|
||||
@ -306,6 +323,19 @@ tor_lzma_compress_process(tor_lzma_compress_state_t *state,
|
||||
case LZMA_OPTIONS_ERROR:
|
||||
case LZMA_DATA_ERROR:
|
||||
case LZMA_PROG_ERROR:
|
||||
#if LZMA_VERSION >= 50030010
|
||||
case LZMA_SEEK_NEEDED:
|
||||
#endif
|
||||
#if LZMA_VERSION >= 50030020
|
||||
case LZMA_RET_INTERNAL1:
|
||||
case LZMA_RET_INTERNAL2:
|
||||
case LZMA_RET_INTERNAL3:
|
||||
case LZMA_RET_INTERNAL4:
|
||||
case LZMA_RET_INTERNAL5:
|
||||
case LZMA_RET_INTERNAL6:
|
||||
case LZMA_RET_INTERNAL7:
|
||||
case LZMA_RET_INTERNAL8:
|
||||
#endif
|
||||
default:
|
||||
log_warn(LD_GENERAL, "LZMA %s didn't finish: %s.",
|
||||
state->compress ? "compression" : "decompression",
|
||||
|
Loading…
Reference in New Issue
Block a user