Commit ee3173c9 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.4.7' into release-0.4.7

parents 85c3995f 7b87ecf7

changes/ticket40741

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Minor feature (lzma):

    - Fix compiler warnings for liblzma >= 5.3.1. Closes ticket 40741.

src/lib/compress/compress_lzma.c

+30 −0
Original line number Diff line number Diff line
@@ -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",