Replace usage of ERROR_EMPTY with ERROR_NOT_FOUND (#30761)

project-chip · Jan 13, 2024 · d89483a · d89483a
1 parent 5976f26
commit d89483a
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 16 deletions.
diff --git a/docs/ERROR_CODES.md b/docs/ERROR_CODES.md
@@ -43,7 +43,6 @@ This file was **AUTOMATICALLY** generated by
 | 26        | 0x1A  | `CHIP_ERROR_DUPLICATE_KEY_ID`                      |
 | 27        | 0x1B  | `CHIP_ERROR_WRONG_KEY_TYPE`                        |
 | 28        | 0x1C  | `CHIP_ERROR_UNINITIALIZED`                         |
-| 29        | 0x1D  | `CHIP_ERROR_EMPTY`                                 |
 | 30        | 0x1E  | `CHIP_ERROR_INVALID_STRING_LENGTH`                 |
 | 31        | 0x1F  | `CHIP_ERROR_INVALID_LIST_LENGTH`                   |
 | 33        | 0x21  | `CHIP_ERROR_END_OF_TLV`                            |

diff --git a/src/lib/address_resolve/AddressResolve.h b/src/lib/address_resolve/AddressResolve.h
@@ -225,7 +225,7 @@ class Resolver
     /// This method will return CHIP_ERROR_INCORRECT_STATE if the handle is
     /// still active.
     ///
-    /// This method will return CHIP_ERROR_EMPTY if there are no more
+    /// This method will return CHIP_ERROR_NOT_FOUND if there are no more
     /// results.
     ///
     /// This method may return other errors in some cases.

diff --git a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
@@ -195,7 +195,7 @@ CHIP_ERROR Resolver::LookupNode(const NodeLookupRequest & request, Impl::NodeLoo
 CHIP_ERROR Resolver::TryNextResult(Impl::NodeLookupHandle & handle)
 {
     VerifyOrReturnError(!mActiveLookups.Contains(&handle), CHIP_ERROR_INCORRECT_STATE);
-    VerifyOrReturnError(handle.HasLookupResult(), CHIP_ERROR_EMPTY);
+    VerifyOrReturnError(handle.HasLookupResult(), CHIP_ERROR_NOT_FOUND);
 
     auto listener = handle.GetListener();
     auto peerId   = handle.GetRequest().GetPeerId();

diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
@@ -143,9 +143,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_UNINITIALIZED.AsInteger():
         desc = "Uninitialized";
         break;
-    case CHIP_ERROR_EMPTY.AsInteger():
-        desc = "Empty";
-        break;
     case CHIP_ERROR_INVALID_STRING_LENGTH.AsInteger():
         desc = "Invalid string length";
         break;

diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
@@ -674,14 +674,7 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_UNINITIALIZED                               CHIP_CORE_ERROR(0x1c)
 
-/**
- *  @def CHIP_ERROR_EMPTY
- *
- *  @brief
- *    A requested object is empty.
- *
- */
-#define CHIP_ERROR_EMPTY                                       CHIP_CORE_ERROR(0x1d)
+// AVAILABLE: 0x1d
 
 /**
  *  @def CHIP_ERROR_INVALID_STRING_LENGTH

diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp
@@ -77,7 +77,6 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_DUPLICATE_KEY_ID,
     CHIP_ERROR_WRONG_KEY_TYPE,
     CHIP_ERROR_UNINITIALIZED,
-    CHIP_ERROR_EMPTY,
     CHIP_ERROR_INVALID_STRING_LENGTH,
     CHIP_ERROR_INVALID_LIST_LENGTH,
     CHIP_END_OF_TLV,

diff --git a/src/lib/shell/commands/Dns.cpp b/src/lib/shell/commands/Dns.cpp
@@ -67,7 +67,7 @@ class DnsShellResolverDelegate : public Dnssd::CommissioningResolveDelegate, pub
         // Schedule a retry. Not called directly so we do not recurse in OnNodeAddressResolved
         DeviceLayer::SystemLayer().ScheduleLambda([this] {
             CHIP_ERROR err = AddressResolve::Resolver::Instance().TryNextResult(Handle());
-            if (err != CHIP_NO_ERROR && err != CHIP_ERROR_EMPTY)
+            if (err != CHIP_NO_ERROR && err != CHIP_ERROR_NOT_FOUND)
             {
                 ChipLogError(Discovery, "Failed to list next result: %" CHIP_ERROR_FORMAT, err.Format());
             }