merge `loek/cleanup` into `loek/audio`

1 files changed, 9 insertions, 10 deletions

diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 0a2f455..80047a6 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 
 #include "Exception.h"
-#include "util/log.h"
+#include "util/Log.h"
 
 #include "DB.h"
 
@@ -15,19 +15,18 @@ DB::DB(const string & path) {
 	// init database struct
 	libdb::DB * db;
 	if ((ret = libdb::db_create(&db, NULL, 0)) != 0)
-		throw Exception("db_create: %s", libdb::db_strerror(ret));
+		throw Exception("db_create: {}", libdb::db_strerror(ret));
 	this->db = {db, [](libdb::DB * db) { db->close(db, 0); }};
 
 	// load or create database file
-	if ((ret = this->db->open(this->db.get(), NULL, path.c_str(), NULL,
-							  libdb::DB_BTREE, DB_CREATE, 0))
-		!= 0)
-		throw Exception("db->open: %s", libdb::db_strerror(ret));
+	ret = this->db->open(this->db.get(), NULL, path.c_str(), NULL,
+						 libdb::DB_BTREE, DB_CREATE, 0);
+	if (ret != 0) throw Exception("db->open: {}", libdb::db_strerror(ret));
 
 	// create cursor
 	libdb::DBC * cursor;
-	if ((ret = this->db->cursor(this->db.get(), NULL, &cursor, 0)) != 0)
-		throw Exception("db->cursor: %s", libdb::db_strerror(ret));
+	ret = this->db->cursor(this->db.get(), NULL, &cursor, 0);
+	if (ret != 0) throw Exception("db->cursor: {}", libdb::db_strerror(ret));
 	this->cursor = {cursor, [](libdb::DBC * cursor) { cursor->close(cursor); }};
 }
 
@@ -45,7 +44,7 @@ string DB::get(const string & key) {
 	memset(&db_val, 0, sizeof(libdb::DBT));
 
 	int ret = this->cursor->get(this->cursor.get(), &db_key, &db_val, DB_FIRST);
-	if (ret != 0) throw Exception("cursor->get: %s", libdb::db_strerror(ret));
+	if (ret != 0) throw Exception("cursor->get: {}", libdb::db_strerror(ret));
 	return {static_cast<char *>(db_val.data), db_val.size};
 }
 
@@ -53,7 +52,7 @@ void DB::set(const string & key, const string & value) {
 	libdb::DBT db_key = this->to_thing(key);
 	libdb::DBT db_val = this->to_thing(value);
 	int ret = this->db->put(this->db.get(), NULL, &db_key, &db_val, 0);
-	if (ret != 0) throw Exception("cursor->get: %s", libdb::db_strerror(ret));
+	if (ret != 0) throw Exception("cursor->get: {}", libdb::db_strerror(ret));
 }
 
 bool DB::has(const std::string & key) noexcept {