clean: unify a common idx file read pattern uint32_t size + data

xiaoyifang · Nov 20, 2024 · 112874b · 112874b
1 parent fa9ad2f
commit 112874b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 55 deletions.
diff --git a/src/dict/aard.cc b/src/dict/aard.cc
@@ -295,11 +295,7 @@ AardDictionary::AardDictionary( string const & id, string const & indexFile, vec
   // Read dictionary name
 
   idx.seek( sizeof( idxHeader ) );
-  vector< char > dName( idx.read< quint32 >() );
-  if ( dName.size() ) {
-    idx.read( &dName.front(), dName.size() );
-    dictionaryName = string( &dName.front(), dName.size() );
-  }
+  idx.readU32SizeAndData<>( dictionaryName );
 
   // Initialize the index
 

diff --git a/src/dict/bgl.cc b/src/dict/bgl.cc
@@ -258,15 +258,7 @@ BglDictionary::BglDictionary( string const & id, string const & indexFile, strin
 
   // Read the dictionary's name
 
-  size_t len = idx.read< uint32_t >();
-
-  if ( len ) {
-    vector< char > nameBuf( len );
-
-    idx.read( &nameBuf.front(), len );
-
-    dictionaryName = string( &nameBuf.front(), len );
-  }
+  idx.readU32SizeAndData<>( dictionaryName );
 
   // Initialize the index
 
@@ -899,8 +891,8 @@ void BglResourceRequest::run()
       break;
     }
 
-    vector< char > nameData( idx.read< uint32_t >() );
-    idx.read( &nameData.front(), nameData.size() );
+    vector< char > nameData;
+    idx.readU32SizeAndData<>( nameData );
 
     for ( size_t x = nameData.size(); x--; ) {
       nameData[ x ] = tolower( nameData[ x ] );
@@ -917,9 +909,9 @@ void BglResourceRequest::run()
 
       data.resize( idx.read< uint32_t >() );
 
-      vector< unsigned char > compressedData( idx.read< uint32_t >() );
+      vector< unsigned char > compressedData;
 
-      idx.read( &compressedData.front(), compressedData.size() );
+      idx.readU32SizeAndData<>( compressedData );
 
       unsigned long decompressedLength = data.size();
 

diff --git a/src/dict/dictdfiles.cc b/src/dict/dictdfiles.cc
@@ -163,11 +163,7 @@ DictdDictionary::DictdDictionary( string const & id,
   // Read the dictionary name
   idx.seek( sizeof( idxHeader ) );
 
-  vector< char > dName( idx.read< uint32_t >() );
-  if ( dName.size() > 0 ) {
-    idx.read( &dName.front(), dName.size() );
-    dictionaryName = string( &dName.front(), dName.size() );
-  }
+  idx.readU32SizeAndData<>( dictionaryName );
 
   // Open the .dict file
 

diff --git a/src/dict/dsl.cc b/src/dict/dsl.cc
@@ -303,17 +303,9 @@ DslDictionary::DslDictionary( string const & id, string const & indexFile, vecto
 
   idx.seek( sizeof( idxHeader ) );
 
-  vector< char > dName( idx.read< uint32_t >() );
-  if ( dName.size() > 0 ) {
-    idx.read( &dName.front(), dName.size() );
-    dictionaryName = string( &dName.front(), dName.size() );
-  }
+  idx.readU32SizeAndData<>( dictionaryName );
+  idx.readU32SizeAndData<>( preferredSoundDictionary );
 
-  vector< char > sName( idx.read< uint32_t >() );
-  if ( sName.size() > 0 ) {
-    idx.read( &sName.front(), sName.size() );
-    preferredSoundDictionary = string( &sName.front(), sName.size() );
-  }
 
   resourceDir1 = getDictionaryFilenames()[ 0 ] + ".files" + Utils::Fs::separator();
   QString s    = QString::fromStdString( getDictionaryFilenames()[ 0 ] );

diff --git a/src/dict/gls.cc b/src/dict/gls.cc
@@ -461,11 +461,7 @@ GlsDictionary::GlsDictionary( string const & id, string const & indexFile, vecto
 
   idx.seek( sizeof( idxHeader ) );
 
-  vector< char > dName( idx.read< uint32_t >() );
-  if ( dName.size() > 0 ) {
-    idx.read( &dName.front(), dName.size() );
-    dictionaryName = string( &dName.front(), dName.size() );
-  }
+  idx.readU32SizeAndData<>( dictionaryName );
 
   // Initialize the index
 

diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
@@ -310,12 +310,7 @@ MdxDictionary::MdxDictionary( string const & id, string const & indexFile, vecto
 {
   // Read the dictionary's name
   idx.seek( sizeof( idxHeader ) );
-  size_t len = idx.read< uint32_t >();
-  vector< char > buf( len );
-  if ( len > 0 ) {
-    idx.read( &buf.front(), len );
-    dictionaryName = string( &buf.front(), len );
-  }
+  idx.readU32SizeAndData<>( dictionaryName );
 
   //fallback, use filename as dictionary name
   if ( dictionaryName.empty() ) {
@@ -324,12 +319,7 @@ MdxDictionary::MdxDictionary( string const & id, string const & indexFile, vecto
   }
 
   // then read the dictionary's encoding
-  len = idx.read< uint32_t >();
-  if ( len > 0 ) {
-    buf.resize( len );
-    idx.read( &buf.front(), len );
-    encoding = string( &buf.front(), len );
-  }
+  idx.readU32SizeAndData<>( encoding );
 
   dictFile.setFileName( QString::fromUtf8( dictionaryFiles[ 0 ].c_str() ) );
   dictFile.open( QIODevice::ReadOnly );

diff --git a/src/dict/sdict.cc b/src/dict/sdict.cc
@@ -196,11 +196,7 @@ SdictDictionary::SdictDictionary( string const & id,
   // Read dictionary name
 
   idx.seek( sizeof( idxHeader ) );
-  vector< char > dName( idx.read< uint32_t >() );
-  if ( dName.size() > 0 ) {
-    idx.read( &dName.front(), dName.size() );
-    dictionaryName = string( &dName.front(), dName.size() );
-  }
+  idx.readU32SizeAndData<>( dictionaryName );
 
   // Initialize the index
 

diff --git a/src/dict/utils/dictfile.hh b/src/dict/utils/dictfile.hh
@@ -81,6 +81,18 @@ public:
   /// Like the above, but uses its own local internal buffer and strips newlines by default.
   std::string gets( bool stripNl = true );
 
+  /// Read 32bit as uint, then reading the subsequent data into a container
+  template< typename T >
+  void readU32SizeAndData( T & container )
+  {
+    uint32_t size = 0;
+    read( &size, sizeof( uint32_t ) );
+    if ( size > 0 ) {
+      container.resize( size );
+      read( container.data(), size );
+    }
+  };
+
   /// export QFile::readall
   QByteArray readall();