diff --git a/jni/NativeFormats/fbreader/src/formats/oeb/OEBBookReader.cpp b/jni/NativeFormats/fbreader/src/formats/oeb/OEBBookReader.cpp index 53600f65d..0c6171ceb 100644 --- a/jni/NativeFormats/fbreader/src/formats/oeb/OEBBookReader.cpp +++ b/jni/NativeFormats/fbreader/src/formats/oeb/OEBBookReader.cpp @@ -189,8 +189,6 @@ void OEBBookReader::endElementHandler(const char *tag) { } bool OEBBookReader::readBook(const ZLFile &file) { - ZLLogger::Instance().registerClass("MARLIN"); - const ZLFile epub = file.getContainerArchive(); epub.forceArchiveType(ZLFile::ZIP); shared_ptr epubDir = epub.directory(); diff --git a/jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp b/jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp index fa8fec90c..18f262e7e 100644 --- a/jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp +++ b/jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp @@ -204,13 +204,13 @@ void XHTMLTagStyleAction::doAtEnd(XHTMLReader &reader) { void XHTMLTagLinkAction::doAtStart(XHTMLReader &reader, const char **xmlattributes) { static const std::string REL = "stylesheet"; const char *rel = reader.attributeValue(xmlattributes, "rel"); - if ((rel == 0) || (REL != rel)) { + if (rel == 0 || REL != rel) { return; } static const std::string TYPE = "text/css"; const char *type = reader.attributeValue(xmlattributes, "type"); - if ((type == 0) || (TYPE != type)) { + if (type == 0 || TYPE != type) { return; } diff --git a/jni/NativeFormats/zlibrary/core/src/filesystem/ZLFile.cpp b/jni/NativeFormats/zlibrary/core/src/filesystem/ZLFile.cpp index e95824df0..61ece819e 100644 --- a/jni/NativeFormats/zlibrary/core/src/filesystem/ZLFile.cpp +++ b/jni/NativeFormats/zlibrary/core/src/filesystem/ZLFile.cpp @@ -99,7 +99,6 @@ shared_ptr ZLFile::envelopeCompressedStream(shared_ptr ZLFile::inputStream(shared_ptr encryptionMap) const { shared_ptr encryptionInfo = encryptionMap.isNull() ? 0 : encryptionMap->info(myPath); - ZLLogger::Instance().println("MARLIN", myPath + " :: " + (encryptionInfo.isNull() ? "not encrypted" : "encrypted")); if (!encryptionInfo.isNull()) { return 0; } diff --git a/jni/NativeFormats/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp b/jni/NativeFormats/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp index 09939108c..c87adcc6a 100644 --- a/jni/NativeFormats/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp +++ b/jni/NativeFormats/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp @@ -45,7 +45,7 @@ ZLZDecompressor::~ZLZDecompressor() { } std::size_t ZLZDecompressor::decompress(ZLInputStream &stream, char *buffer, std::size_t maxSize) { - while ((myBuffer.length() < maxSize) && (myAvailableSize > 0)) { + while (myBuffer.length() < maxSize && myAvailableSize > 0) { std::size_t size = std::min(myAvailableSize, (std::size_t)IN_BUFFER_SIZE); myZStream->next_in = (Bytef*)myInBuffer;