author | erik <erik> | 2007-01-24 19:50:48 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-24 19:50:48 (UTC) |
commit | 035bbc5bf689839c8d8e7be37f347b0dd900fccf (patch) (side-by-side diff) | |
tree | cd668db7b1fedbf6fa2d54fb312a90e6f157e82a /noncore/apps | |
parent | a017bf21dd89159052f2f7a3fbc043a24956c08c (diff) | |
download | opie-035bbc5bf689839c8d8e7be37f347b0dd900fccf.zip opie-035bbc5bf689839c8d8e7be37f347b0dd900fccf.tar.gz opie-035bbc5bf689839c8d8e7be37f347b0dd900fccf.tar.bz2 |
Eac one the files in this commit had an instance where a code path is
never traversed because of conditionals operating on values that
never change.
-rw-r--r-- | noncore/apps/opie-reader/decompress.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/noncore/apps/opie-reader/decompress.cpp b/noncore/apps/opie-reader/decompress.cpp index 9bfec49..6034e01 100644 --- a/noncore/apps/opie-reader/decompress.cpp +++ b/noncore/apps/opie-reader/decompress.cpp @@ -1,78 +1,71 @@ #include <string.h> #include "decompress.h" #include <zlib.h> #include <stdlib.h> size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bsize) { z_stream zstream; memset(&zstream,sizeof(zstream),0); zstream.next_in = compressedbuffer; zstream.next_out = tgtbuffer; zstream.avail_out = bsize; zstream.avail_in = reclen; - int keylen = 0; - zstream.zalloc = Z_NULL; zstream.zfree = Z_NULL; zstream.opaque = Z_NULL; // printf("Initialising\n"); inflateInit(&zstream); int err = 0; do { - if ( zstream.avail_in == 0 && 0 < keylen ) { - zstream.next_in = compressedbuffer + keylen; - zstream.avail_in = reclen - keylen; - keylen = 0; - } zstream.next_out = tgtbuffer; zstream.avail_out = bsize; err = inflate( &zstream, Z_SYNC_FLUSH ); // //qDebug("err:%d - %u", err, zstream.avail_in); } while ( err == Z_OK ); inflateEnd(&zstream); return zstream.total_out; } #if defined(__STATIC) && defined(USENEF) #include "Model.h" size_t (*getdecompressor(char* _s))(UInt8*, size_t, UInt8*, size_t) { if (strcmp(_s, "PluckerDecompress3") == 0) { return PluckerDecompress3; } if (strcmp(_s, "PluckerDecompress4") == 0) { return PluckerDecompress4; } if (strcmp(_s, "RebDecompress") == 0) { return RebDecompress; } return NULL; } #else #include "qfileinfo.h" #include <dlfcn.h> size_t (*getdecompressor(char* _s))(UInt8*, size_t, UInt8*, size_t) { #ifdef USEQPE #ifdef OPIE QString codecpath(getenv("OPIEDIR")); #else QString codecpath(getenv("QTDIR")); #endif codecpath += "/plugins/reader/support/libpluckerdecompress.so"; #else QString codecpath(getenv("READERDIR")); |