commit bf90481565f93fc43b629e3cf739e16160138e8a
author Keir Mierle <keir@google.com> Wed Mar 11 17:28:22 2020 -0700
committer Keir Mierle <keir@google.com> Wed Mar 11 17:28:22 2020 -0700
tree a56eead2969899acee04b84ec709976602ac58c5
parent 4f9dc8555ba707cce04cfa30c04b79bc8a16a2c8

pw_kvs: Fix constructor order issue

Fixes: pwbug/155
Change-Id: I28cdfa596872b3f2e5693a520222db3ed39ff5b4

pw_kvs/key_value_store.cc

diff --git a/pw_kvs/key_value_store.cc b/pw_kvs/key_value_store.cc
index a04ca6a..0109ce6 100644
--- a/pw_kvs/key_value_store.cc
+++ b/pw_kvs/key_value_store.cc
@@ -50,11 +50,16 @@
       sectors_(sector_descriptor_list),
       redundancy_(redundancy),
       options_(options) {
-  Reset();
+  initialized_ = false;
+  last_new_sector_ = nullptr;
+  last_transaction_id_ = 0;
 }
 
 Status KeyValueStore::Init() {
-  Reset();
+  initialized_ = false;
+  last_new_sector_ = nullptr;
+  last_transaction_id_ = 0;
+  key_descriptors_.clear();
 
   INF("Initializing key value store");
   if (partition_.sector_count() > sectors_.max_size()) {
@@ -1166,13 +1171,6 @@
                       last_transaction_id_);
 }
 
-void KeyValueStore::Reset() {
-  initialized_ = false;
-  key_descriptors_.clear();
-  last_new_sector_ = nullptr;
-  last_transaction_id_ = 0;
-}
-
 void KeyValueStore::LogDebugInfo() {
   const size_t sector_size_bytes = partition_.sector_size_bytes();
   DBG("====================== KEY VALUE STORE DUMP =========================");

pw_kvs/public/pw_kvs/key_value_store.h

diff --git a/pw_kvs/public/pw_kvs/key_value_store.h b/pw_kvs/public/pw_kvs/key_value_store.h
index 47a738c..33a2bc6 100644
--- a/pw_kvs/public/pw_kvs/key_value_store.h
+++ b/pw_kvs/public/pw_kvs/key_value_store.h
@@ -436,8 +436,6 @@
                               span<const std::byte> value,
                               KeyDescriptor::State state);
 
-  void Reset();
-
   void LogSectors() const;
   void LogKeyDescriptor() const;