diff --git a/src/dsl.cc b/src/dsl.cc index 830292e5..6fe42cec 100644 --- a/src/dsl.cc +++ b/src/dsl.cc @@ -68,7 +68,7 @@ DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex ) enum { Signature = 0x584c5344, // DSLX on little-endian, XLSD on big-endian - CurrentFormatVersion = 11 + BtreeIndexing::FormatVersion + Folding::Version + CurrentFormatVersion = 12 + BtreeIndexing::FormatVersion + Folding::Version }; struct IdxHeader diff --git a/src/dsl_details.cc b/src/dsl_details.cc index ff63059d..af581923 100644 --- a/src/dsl_details.cc +++ b/src/dsl_details.cc @@ -622,12 +622,7 @@ bool DslScanner::readNextLine( wstring & out, size_t & offset ) throw( Ex, // Check that we have bytes to read if ( readBufferLeft < 4 ) // To convert one char, we need at most 4 bytes { - if ( gzeof( f ) ) - { - if ( !readBufferLeft ) - return false; - } - else + if ( !gzeof( f ) ) { // To avoid having to deal with ring logic, we move the remaining bytes // to the beginning