Merging upstream version 1.24.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/mtester.cc b/mtester.cc
index 33126ee..fb9eb97 100644
--- a/mtester.cc
+++ b/mtester.cc
@@ -1,5 +1,5 @@
 /* Lziprecover - Data recovery tool for the lzip format
-   Copyright (C) 2009-2023 Antonio Diaz Diaz.
+   Copyright (C) 2009-2024 Antonio Diaz Diaz.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -102,8 +102,6 @@ bool LZ_mtester::check_trailer( FILE * const f, unsigned long long byte_pos )
         std::fputs( "Can't get trailer.\n", f ); }
     return false;
     }
-  const unsigned long long data_size = data_position();
-  const unsigned long member_size = rdec.member_position();
   bool error = false;
 
   const unsigned td_crc = trailer->data_crc();
@@ -116,6 +114,7 @@ bool LZ_mtester::check_trailer( FILE * const f, unsigned long long byte_pos )
         std::fprintf( f, "CRC mismatch; stored %08X, computed %08X\n",
                       td_crc, crc() ); }
     }
+  const unsigned long long data_size = data_position();
   const unsigned long long td_size = trailer->data_size();
   if( td_size != data_size )
     {
@@ -126,6 +125,7 @@ bool LZ_mtester::check_trailer( FILE * const f, unsigned long long byte_pos )
         std::fprintf( f, "Data size mismatch; stored %llu (0x%llX), computed %llu (0x%llX)\n",
                       td_size, td_size, data_size, data_size ); }
     }
+  const unsigned long member_size = rdec.member_position();
   const unsigned long long tm_size = trailer->member_size();
   if( tm_size != member_size )
     {
@@ -350,9 +350,7 @@ int LZ_mtester::debug_decode_member( const long long dpos, const long long mpos,
               return 3;
               }
             if( len == min_match_len + 1 )	// Sync Flush marker
-              {
-              rdec.load(); continue;
-              }
+              { rdec.load(); continue; }
             return 4;
             }
           }