Adding upstream version 1.16~pre2.upstream/1.16_pre2

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 5 insertions, 5 deletions

diff --git a/range_dec.cc b/range_dec.cc
index 2c6c342..111405d 100644
--- a/range_dec.cc
+++ b/range_dec.cc
@@ -203,13 +203,13 @@ int list_file( const char * const input_filename, const Pretty_print & pp )
 
     if( pp.verbosity() >= 1 && file_index.members() > 1 )
       {
-      std::printf( "    Total members in file = %d.\n", file_index.members() );
+      std::printf( "    Total members in file = %ld.\n", file_index.members() );
       if( pp.verbosity() >= 2 )
-        for( int i = 0; i < file_index.members(); ++i )
+        for( long i = 0; i < file_index.members(); ++i )
           {
           const Block & db = file_index.dblock( i );
           const Block & mb = file_index.mblock( i );
-          std::printf( "    Member %3d   data pos %9llu   data size %7llu   "
+          std::printf( "    Member %3ld   data pos %9llu   data size %7llu   "
                        "member pos %9llu   member size %7llu.\n", i + 1,
                        db.pos(), db.size(), mb.pos(), mb.size() );
           }
@@ -282,13 +282,13 @@ int range_decompress( const std::string & input_filename,
       if( outfd < 0 ) return 1; }
 
   int retval = 0;
-  for( int i = 0; i < file_index.members(); ++i )
+  for( long i = 0; i < file_index.members(); ++i )
     {
     const Block & db = file_index.dblock( i );
     if( range.overlaps( db ) )
       {
       if( verbosity >= 3 )
-        std::fprintf( stderr, "Decompressing member %3d\n", i + 1 );
+        std::fprintf( stderr, "Decompressing member %3ld\n", i + 1 );
       const long long outskip = std::max( 0LL, range.pos() - db.pos() );
       const long long outend = std::min( db.size(), range.end() - db.pos() );
       const long long mpos = file_index.mblock( i ).pos();