Merge pull request #83182 from akrieger/no_zeds_in_zzip

Remove zombie code from zzip from last refactor

Author: kevingranade

src/zzip.cpp

@@ -395,11 +395,8 @@ std::optional<zzip> zzip::load(
 
     ZSTD_CCtx *cctx;
     ZSTD_DCtx *dctx;
-    if( dictionary_path.empty() ) {
-        cctx = ZSTD_createCCtx();
-        dctx = ZSTD_createDCtx();
-    } else if( auto it = cached_contexts.find( dictionary_path.generic_u8string() );
-               it != cached_contexts.end() ) {
+    if( auto it = cached_contexts.find( dictionary_path.generic_u8string() );
+        it != cached_contexts.end() ) {
         cctx = it->second.cctx;
         dctx = it->second.dctx;
     } else {

tools/save/zzip_main.cpp

@@ -220,22 +220,8 @@ struct ZzipStream {
 
 #define RETURN_ERROR(e) err = e; return entry
 
-            // Skip the zzip header.
-            if( !ZSTD_isSkippableFrame( base, remaining_len ) ) {
-                RETURN_ERROR( ZzipError( zzip_path, 0, "Zzip does not start with skippable frame." ) );
-            }
-
-            // The first frame of a zzip should be a skippable frame of two 64 bit ints
             ZSTD_FrameHeader header;
-            size_t error_code = ZSTD_getFrameHeader( &header, base, remaining_len );
-            if( ZSTD_isError( error_code ) ||
-                header.dictID != kFooterChecksumMagic ||
-                header.frameContentSize != 2 * sizeof( uint64_t ) ) {
-                RETURN_ERROR( ZzipError( zzip_path, 0, "Error reading zzip header." ) );
-            }
-
-            base += ZSTD_SKIPPABLEHEADERSIZE + 2 * sizeof( uint64_t );
-            remaining_len -= ZSTD_SKIPPABLEHEADERSIZE + 2 * sizeof( uint64_t );
+            size_t error_code = 0;
 
             std::string filename;
             uint64_t checksum = 0;
@@ -402,7 +388,6 @@ static int decompress_to( std::filesystem::path const &zzip_path,
         } catch( std::exception &e ) {
             throw FsError( output_file, {}, std::string{ "Error writing output: " } + e.what() );
         }
-        return {};
     }
     if( !zs.good() ) {
         zs.e().throw_exception();