Make VerifyOrDo spelling clearer. (#18741)

It took me a bit to figure out what the "Ordo" thing being verified was.
project-chip · Jun 9, 2022 · a7ad089 · a7ad089
1 parent 70d1f8c
commit a7ad089
Show file tree

Hide file tree

Showing 6 changed files with 587 additions and 587 deletions.
diff --git a/examples/chip-tool/templates/tests/partials/test_step.zapt b/examples/chip-tool/templates/tests/partials/test_step.zapt
@@ -2,7 +2,7 @@
 
 {{~#*inline "maybePICS"}}
 {{#if PICS}}
-    VerifyOrdo(!ShouldSkip("{{PICS}}"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+    VerifyOrDo(!ShouldSkip("{{PICS}}"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
 {{/if}}
 {{/inline~}}
 

diff --git a/src/lib/support/CodeUtils.h b/src/lib/support/CodeUtils.h
@@ -593,20 +593,20 @@ inline void chipDie(void)
     } while (false)
 
 /**
- *  @def VerifyOrdo(expr, ...)
+ *  @def VerifyOrDo(expr, ...)
  *
  *  @brief
  *    do something if expression evaluates to false
  *
  *  Example usage:
  *
  * @code
- *    VerifyOrdo(param != nullptr, LogError("param is nullptr"));
+ *    VerifyOrDo(param != nullptr, LogError("param is nullptr"));
  *  @endcode
  *
  *  @param[in]  expr        A Boolean expression to be evaluated.
  */
-#define VerifyOrdo(expr, ...)                                                                                                      \
+#define VerifyOrDo(expr, ...)                                                                                                      \
     do                                                                                                                             \
     {                                                                                                                              \
         if (!(expr))                                                                                                               \

diff --git a/src/platform/ESP32/KeyValueStoreManagerImpl.cpp b/src/platform/ESP32/KeyValueStoreManagerImpl.cpp
@@ -78,7 +78,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t
     ReturnErrorOnFailure(handle.Open(kNamespace, NVS_READONLY));
 
     char keyHash[NVS_KEY_NAME_MAX_SIZE];
-    VerifyOrdo(HashIfLongKey(key, keyHash) == false, key = keyHash);
+    VerifyOrDo(HashIfLongKey(key, keyHash) == false, key = keyHash);
 
     ReturnMappedErrorOnFailure(nvs_get_blob(handle, key, value, &value_size));
 
@@ -98,7 +98,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value,
     ReturnErrorOnFailure(handle.Open(kNamespace, NVS_READWRITE));
 
     char keyHash[NVS_KEY_NAME_MAX_SIZE];
-    VerifyOrdo(HashIfLongKey(key, keyHash) == false, key = keyHash);
+    VerifyOrDo(HashIfLongKey(key, keyHash) == false, key = keyHash);
 
     ReturnMappedErrorOnFailure(nvs_set_blob(handle, key, value, value_size));
 
@@ -115,7 +115,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
     ReturnErrorOnFailure(handle.Open(kNamespace, NVS_READWRITE));
 
     char keyHash[NVS_KEY_NAME_MAX_SIZE];
-    VerifyOrdo(HashIfLongKey(key, keyHash) == false, key = keyHash);
+    VerifyOrDo(HashIfLongKey(key, keyHash) == false, key = keyHash);
 
     ReturnMappedErrorOnFailure(nvs_erase_key(handle, key));