From 9df087ede0b539ecbd2778236c7d1143362b384d Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 7 Nov 2024 18:57:04 +0100 Subject: check code standard --- src/crepe/facade/DB.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/crepe/facade/DB.cpp') diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp index bd2f089..c885560 100644 --- a/src/crepe/facade/DB.cpp +++ b/src/crepe/facade/DB.cpp @@ -1,6 +1,7 @@ #include #include "util/log.h" +#include "Exception.h" #include "DB.h" @@ -14,24 +15,22 @@ DB::DB(const string & path) { // init database struct libdb::DB * db; if ((ret = libdb::db_create(&db, NULL, 0)) != 0) - throw nullptr; // TODO: exception + throw Exception("db_create: %s", 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 nullptr; - } + 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)); // create cursor libdb::DBC * cursor; - if ((ret = this->db->cursor(this->db.get(), NULL, &cursor, 0)) != 0) { - throw nullptr; - } + if ((ret = this->db->cursor(this->db.get(), NULL, &cursor, 0)) != 0) + throw Exception("db->cursor: %s", libdb::db_strerror(ret)); this->cursor = { cursor, [] (libdb::DBC * cursor) { cursor->close(cursor); } }; } -libdb::DBT DB::to_thing(const string & thing) const { +libdb::DBT DB::to_thing(const string & thing) const noexcept { libdb::DBT thang; memset(&thang, 0, sizeof(libdb::DBT)); thang.data = (void *) thing.data(); @@ -45,7 +44,8 @@ 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 nullptr; // TODO: proper exception + if (ret != 0) + throw Exception("cursor->get: %s", libdb::db_strerror(ret)); return { static_cast(db_val.data), db_val.size }; } @@ -53,7 +53,8 @@ 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 nullptr; // TODO: proper exception + if (ret != 0) + throw Exception("cursor->get: %s", libdb::db_strerror(ret)); } bool DB::has(const std::string & key) noexcept { -- cgit v1.2.3