clean: remove zstd related code which is unused since the migration to

libzim
This commit is contained in:
shenleban tongying 2023-07-08 16:29:54 -04:00
parent d6a64bea7e
commit a5be5134c8
No known key found for this signature in database
5 changed files with 2 additions and 48 deletions

View file

@ -40,7 +40,6 @@ pkg_check_modules(PKGCONFIG_DEPS IMPORTED_TARGET
vorbis # .ogg vorbis # .ogg
vorbisfile vorbisfile
liblzma liblzma
libzstd
) )
target_link_libraries(${GOLDENDICT} PRIVATE target_link_libraries(${GOLDENDICT} PRIVATE

View file

@ -552,7 +552,7 @@ SOURCES += src/common/wildcard.cc
CONFIG( zim_support ) { CONFIG( zim_support ) {
DEFINES += MAKE_ZIM_SUPPORT DEFINES += MAKE_ZIM_SUPPORT
LIBS += -llzma -lzstd -lzim LIBS += -llzma -lzim
win32{ win32{
Debug: LIBS+= -L$$PWD/winlibs/lib/dbg/ Debug: LIBS+= -L$$PWD/winlibs/lib/dbg/

View file

@ -4,7 +4,6 @@
#ifdef MAKE_ZIM_SUPPORT #ifdef MAKE_ZIM_SUPPORT
#include "lzma.h" #include "lzma.h"
#include "zstd.h"
#endif #endif
#define CHUNK_SIZE 2048 #define CHUNK_SIZE 2048
@ -132,46 +131,4 @@ char buf[CHUNK_SIZE];
return str; return str;
} }
string decompressZstd( const char *bufptr, unsigned length )
{
string str;
char buf[CHUNK_SIZE];
size_t res;
// string err;
ZSTD_DStream *zds;
ZSTD_inBuffer in_buf = { bufptr, length, 0 };
ZSTD_outBuffer out_buf = { buf, CHUNK_SIZE, 0 };
zds = ZSTD_createDStream();
if( !zds )
return str;
res = ZSTD_initDStream( zds );
if( ZSTD_isError( res ) )
{
// err = string( ZSTD_getErrorName( res ) );
ZSTD_freeDStream( zds );
return str;
}
do
{
out_buf.pos = 0;
res = ZSTD_decompressStream( zds, &out_buf, &in_buf );
if( ZSTD_isError( res ) )
{
// err = string( ZSTD_getErrorName( res ) );
ZSTD_freeDStream( zds );
return string();
}
str.append( buf, out_buf.pos );
}
while( out_buf.pos >= out_buf.size );
ZSTD_freeDStream( zds );
return str;
}
#endif #endif

View file

@ -17,8 +17,6 @@ string decompressBzip2( const char * bufptr, unsigned length );
string decompressLzma2( const char * bufptr, unsigned length, string decompressLzma2( const char * bufptr, unsigned length,
bool raw_decoder = false ); bool raw_decoder = false );
string decompressZstd( const char * bufptr, unsigned length );
#endif #endif
#endif // DECOMPRESS_HH #endif // DECOMPRESS_HH

View file

@ -29,11 +29,11 @@ In other words, those libraries
* x11 (linux only) * x11 (linux only)
And a few compression libraries: And a few compression libraries:
* xz (lzma) * xz (lzma)
* bzip2 * bzip2
* lzo2 * lzo2
* zlib * zlib
* zstd
## CMake Build ## CMake Build