From 5b49afc7488d05a06cc642e82a7de66ab8985313 Mon Sep 17 00:00:00 2001
From: Den Raskovalov <denbox@gmail.com>
Date: Sun, 5 Apr 2020 17:32:14 -0700
Subject: [PATCH] nits for compatibility with Ubuntu Focal Fossa

---
 fbreader/src/database/booksdb/BooksDB.cpp            | 6 +++---
 fbreader/src/network/BookReference.cpp               | 3 +++
 fbreader/src/network/BookReference.h                 | 1 +
 zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp
index e33a22e76..3bc461392 100644
--- a/fbreader/src/database/booksdb/BooksDB.cpp
+++ b/fbreader/src/database/booksdb/BooksDB.cpp
@@ -62,7 +62,7 @@ bool BooksDB::initDatabase() {
 
 	if (!open()) {
 		return false;
-	} 
+	}
 
 	myInitialized = true;
 
@@ -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();
@@ -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;
diff --git a/fbreader/src/network/BookReference.cpp b/fbreader/src/network/BookReference.cpp
index eb968f546..6c60323ae 100644
--- a/fbreader/src/network/BookReference.cpp
+++ b/fbreader/src/network/BookReference.cpp
@@ -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;
 }
diff --git a/fbreader/src/network/BookReference.h b/fbreader/src/network/BookReference.h
index ec4e40d98..7f2894f9e 100644
--- a/fbreader/src/network/BookReference.h
+++ b/fbreader/src/network/BookReference.h
@@ -44,6 +44,7 @@ class BookReference {
 
 public:
 	BookReference(const std::string &url, Format format, Type type);
+	virtual ~BookReference();
 
 public:
 	const std::string URL;
diff --git a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp
index 54cc37f6c..a5a671813 100644
--- a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp
+++ b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp
@@ -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;