Skip to content
This repository was archived by the owner on Oct 25, 2021. It is now read-only.

nits for compatibility with Ubuntu Focal Fossa #318

Open
evilmucedin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nits for compatibility with Ubuntu Focal Fossa #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions fbreader/src/database/booksdb/BooksDB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bool BooksDB::initDatabase() {

if (!open()) {
return false;
}
}

myInitialized = true;

Expand Down Expand Up @@ -145,7 +145,7 @@ shared_ptr<Book> BooksDB::loadBook(const std::string &fileName) {

myFindFileId->setFileName(fileName);
if (!myFindFileId->run()) {
return false;
return 0;
}
((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();
shared_ptr<DBDataReader> reader = myLoadBook->executeReader();
Expand Down Expand Up @@ -440,7 +440,7 @@ bool BooksDB::setNetFile(const std::string &url, const std::string &fileName) {
"INSERT OR REPLACE INTO NetFiles (url, file_id) VALUES (@url, @file_id);",
connection(), "@file_id", DBValue::DBINT, "@url", DBValue::DBTEXT
);

myFindFileId->setFileName(fileName, true);
if (!myFindFileId->run()) {
return false;
Expand Down
3 changes: 3 additions & 0 deletions fbreader/src/network/BookReference.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
BookReference::BookReference(const std::string &url, Format format, Type type) : URL(url), BookFormat(format), ReferenceType(type) {
}

BookReference::~BookReference(){
}

const std::string &BookReference::cleanURL() const {
return URL;
}
Expand Down
1 change: 1 addition & 0 deletions fbreader/src/network/BookReference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class BookReference {

public:
BookReference(const std::string &url, Format format, Type type);
virtual ~BookReference();

public:
const std::string URL;
Expand Down
2 changes: 2 additions & 0 deletions zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,11 @@ std::string ZLCurlNetworkManager::perform(const ZLExecutionData::Vector &dataLis
#endif
errors.insert(ZLStringUtil::printf(errorResource["peerFailedVerificationMessage"].value(), ZLNetworkUtil::hostFromUrl(url)));
break;
#if LIBCURL_VERSION_NUM < 0x074400
case CURLE_SSL_CACERT:
errors.insert(ZLStringUtil::printf(errorResource["sslCertificateAuthorityMessage"].value(), ZLNetworkUtil::hostFromUrl(url)));
break;
#endif
case CURLE_SSL_CACERT_BADFILE:
errors.insert(ZLStringUtil::printf(errorResource["sslBadCertificateFileMessage"].value(), request.sslCertificate().Path));
break;
Expand Down