Ink-Board/ink-board
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: invalid const and declaration ordering and added smart pointer for get

Browse Source
This commit is contained in:
GW_MC
2026-01-19 21:09:11 +08:00
parent 4cda7d2de3
commit 41516374f0
4 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
main/io/nvs_handler.h
View File

@@ -3,31 +3,6 @@
#include "freertos/FreeRTOS.h"
#include "nvs.h"
class NVSStorageHandler : public KVStorageHandler {
public:
NVSStorageHandler(
const char* name_space
);
~NVSStorageHandler() override;
void init(const EventGroupHandle_t& system_event_group) override;
void put(const char* const& key, const char* const& value) override;
char* get(const char* const& key) const override;
esp_err_t process_all(KeyValueProcessor processor, void* arg) const override;
esp_err_t process_filtered(const char* const& key_prefix, KeyValueProcessor processor, void* arg) const override;
esp_err_t process_filtered(FilterFunc filter_func, KeyValueProcessor processor, void* arg) const override;
void remove(const char* const& key) override;
private:
NVSIteratorGuard create_iterator() const;
nvs_handle_t nvsHandle = 0;
const char* name_space;
};
struct NVSIteratorGuard {
public:
~NVSIteratorGuard() {
@@ -35,9 +10,14 @@ public:
nvs_release_iterator(iterator);
}
}
const nvs_iterator_t const& get_iterator() const {
// accessors to the iterator, the internal state should not be modified directly
// The iterator is advanced using advance_iter(), and is changed to nullptr on error or end
// Caller MUST NOT release the iterator manually nor call get_iterator after advance_iter
const nvs_iterator_t& get_iterator() const {
return iterator;
}
void advance_iter() {
if (iterator) {
// advance the iterator and update the internal state
@@ -63,3 +43,28 @@ private:
nvs_iterator_t iterator;
esp_err_t error;
};
class NVSStorageHandler : public KVStorageHandler {
public:
NVSStorageHandler(
const char* name_space
);
~NVSStorageHandler() override;
void init(const EventGroupHandle_t& system_event_group) override;
void put(const char* const& key, const char* const& value) override;
std::unique_ptr<char[]> get(const char* const& key) const override;
esp_err_t process_all(KeyValueProcessor processor, void* arg) const override;
esp_err_t process_filtered(const char* const& key_prefix, KeyValueProcessor processor, void* arg) const override;
esp_err_t process_filtered(FilterFunc filter_func, KeyValueProcessor processor, void* arg) const override;
void remove(const char* const& key) override;
private:
NVSIteratorGuard create_iterator() const;
nvs_handle_t nvsHandle = 0;
const char* name_space;
};