From 1002c15e0d5c3b7f1715245ea1f7e967b2df0f9f Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 8 Dec 2020 18:54:36 +0100 Subject: [PATCH] Remove unnecessary checks. `Reader` cannot be created with a null `zimArchive`. We don't have to check for zimArchive being not null. --- src/reader.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/reader.cpp b/src/reader.cpp index 862f61bd5..db756f7b9 100644 --- a/src/reader.cpp +++ b/src/reader.cpp @@ -339,10 +339,6 @@ string Reader::getOrigId() const Entry Reader::getEntryFromPath(const std::string& path) const { - if (!this->zimArchive) { - throw NoEntry(); - } - if (path.empty() || path == "/") { return getMainPage(); } @@ -361,10 +357,6 @@ Entry Reader::getEntryFromEncodedPath(const std::string& path) const Entry Reader::getEntryFromTitle(const std::string& title) const { - if (!this->zimArchive) { - throw NoEntry(); - } - try { return zimArchive->getEntryByTitle(title); } catch(zim::EntryNotFound& e) { @@ -374,22 +366,12 @@ Entry Reader::getEntryFromTitle(const std::string& title) const bool Reader::pathExists(const string& path) const { - if (!zimArchive) - { - return false; - } - return zimArchive->hasEntryByPath(path); } /* Does the ZIM file has a fulltext index */ bool Reader::hasFulltextIndex() const { - if (!zimArchive) - { - return false; - } - return zimArchive->hasFulltextIndex(); } @@ -593,9 +575,6 @@ bool Reader::isCorrupted() const /* Return the file size, works also for splitted files */ unsigned int Reader::getFileSize() const { - if (!zimArchive) { - return 0; - } return zimArchive->getFilesize() / 1024; }