commit 729f28cd59ca5b8ab1936a5d86dc5886f7bd0163
author Wyatt Hepler <hepler@google.com> Wed Feb 05 09:46:00 2020 -0800
committer Wyatt Hepler <hepler@google.com> Wed Feb 05 10:01:42 2020 -0800
tree b406328755c3988a8f9796811510f8e9abfcc449
parent 1c83000fd916ba07fb1174cddcf2a50cdf033e66

pw_kvs: Implement initialized, naming cleanup

- Rename InvalidOperation to CheckOperation to fit better with use of
  TRY.
- Renamed enabled_ to initialized_ to match Init() function.

Change-Id: Iea2345e3321ec2ff7bf88ec903ba0f62e0a9b8f4

pw_kvs/key_value_store.cc

diff --git a/pw_kvs/key_value_store.cc b/pw_kvs/key_value_store.cc
index 0169301..09747d6 100644
--- a/pw_kvs/key_value_store.cc
+++ b/pw_kvs/key_value_store.cc
@@ -126,7 +126,7 @@
     TRY(ReadEntryHeader(key_descriptor, &header));
     sector_map_[sector_id].valid_bytes += header.size();
   }
-  enabled_ = true;
+  initialized_ = true;
   return Status::OK;
 }
 
@@ -247,7 +247,7 @@
 
 StatusWithSize KeyValueStore::Get(string_view key,
                                   span<byte> value_buffer) const {
-  TRY(InvalidOperation(key));
+  TRY(CheckOperation(key));
 
   const KeyDescriptor* key_descriptor;
   TRY(FindKeyDescriptor(key, &key_descriptor));
@@ -268,7 +268,8 @@
   DBG("Writing key/value; key length=%zu, value length=%zu",
       key.size(),
       value.size());
-  TRY(InvalidOperation(key));
+
+  TRY(CheckOperation(key));
 
   if (value.size() > (1 << 24)) {
     // TODO: Reject sizes that are larger than the maximum?
@@ -285,7 +286,8 @@
 }
 
 Status KeyValueStore::Delete(string_view key) {
-  TRY(InvalidOperation(key));
+  TRY(CheckOperation(key));
+
   return Status::UNIMPLEMENTED;
 }
 
@@ -304,7 +306,7 @@
 }
 
 StatusWithSize KeyValueStore::ValueSize(std::string_view key) const {
-  TRY(InvalidOperation(key));
+  TRY(CheckOperation(key));
 
   const KeyDescriptor* key_descriptor;
   TRY(FindKeyDescriptor(key, &key_descriptor));
@@ -330,11 +332,11 @@
   return Get(key, span(value, size_bytes)).status();
 }
 
-Status KeyValueStore::InvalidOperation(string_view key) const {
+Status KeyValueStore::CheckOperation(string_view key) const {
   if (InvalidKey(key)) {
     return Status::INVALID_ARGUMENT;
   }
-  if (!enabled_) {
+  if (!initialized_) {
     return Status::FAILED_PRECONDITION;
   }
   return Status::OK;