Skip to content

Commit 5269ad2

Browse files
arkqarkq
authored
Remove WELL from empty/uninitialized error names (project-chip#30737)
* Remove WELL from empty/uninitialized error names * Fix trimmed new line in ERROR_CODES
1 parent 03efab5 commit 5269ad2

35 files changed

+96
-96
lines changed

‎docs/ERROR_CODES.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ This file was **AUTOMATICALLY** generated by
4242
| 25 | 0x19 | `CHIP_ERROR_BUFFER_TOO_SMALL` |
4343
| 26 | 0x1A | `CHIP_ERROR_DUPLICATE_KEY_ID` |
4444
| 27 | 0x1B | `CHIP_ERROR_WRONG_KEY_TYPE` |
45-
| 28 | 0x1C | `CHIP_ERROR_WELL_UNINITIALIZED` |
46-
| 29 | 0x1D | `CHIP_ERROR_WELL_EMPTY` |
45+
| 28 | 0x1C | `CHIP_ERROR_UNINITIALIZED` |
46+
| 29 | 0x1D | `CHIP_ERROR_EMPTY` |
4747
| 30 | 0x1E | `CHIP_ERROR_INVALID_STRING_LENGTH` |
4848
| 31 | 0x1F | `CHIP_ERROR_INVALID_LIST_LENGTH` |
4949
| 33 | 0x21 | `CHIP_ERROR_END_OF_TLV` |

‎examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ CHIP_ERROR AppTask::Init()
163163
if (rc != 0)
164164
{
165165
P6_LOG("boot_set_confirmed failed");
166-
appError(CHIP_ERROR_WELL_UNINITIALIZED);
166+
appError(CHIP_ERROR_UNINITIALIZED);
167167
}
168168
#endif
169169
// Register the callback to init the MDNS server when connectivity is available

‎examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ CHIP_ERROR AppTask::Init()
160160
if (rc != 0)
161161
{
162162
P6_LOG("boot_set_confirmed failed");
163-
appError(CHIP_ERROR_WELL_UNINITIALIZED);
163+
appError(CHIP_ERROR_UNINITIALIZED);
164164
}
165165
#endif
166166
// Register the callback to init the MDNS server when connectivity is available

‎examples/lighting-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ CHIP_ERROR AppTask::Init()
177177
if (rc != 0)
178178
{
179179
P6_LOG("boot_set_confirmed failed");
180-
appError(CHIP_ERROR_WELL_UNINITIALIZED);
180+
appError(CHIP_ERROR_UNINITIALIZED);
181181
}
182182
#endif
183183
// Register the callback to init the MDNS server when connectivity is available

‎examples/lock-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void AppTask::Init()
282282
if (rc != 0)
283283
{
284284
P6_LOG("boot_set_confirmed failed");
285-
appError(CHIP_ERROR_WELL_UNINITIALIZED);
285+
appError(CHIP_ERROR_UNINITIALIZED);
286286
}
287287
#endif
288288
// Initialise WSTK buttons PB0 and PB1 (including debounce).

‎examples/platform/linux/LinuxCommissionableDataProvider.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CHIP_ERROR LinuxCommissionableDataProvider::Init(chip::Optional<std::vector<uint
4242
chip::Optional<std::vector<uint8_t>> spake2pSalt, uint32_t spake2pIterationCount,
4343
chip::Optional<uint32_t> setupPasscode, uint16_t discriminator)
4444
{
45-
VerifyOrReturnError(mIsInitialized == false, CHIP_ERROR_WELL_UNINITIALIZED);
45+
VerifyOrReturnError(mIsInitialized == false, CHIP_ERROR_UNINITIALIZED);
4646

4747
if (discriminator > chip::kMaxDiscriminatorValue)
4848
{
@@ -174,21 +174,21 @@ CHIP_ERROR LinuxCommissionableDataProvider::Init(chip::Optional<std::vector<uint
174174

175175
CHIP_ERROR LinuxCommissionableDataProvider::GetSetupDiscriminator(uint16_t & setupDiscriminator)
176176
{
177-
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_WELL_UNINITIALIZED);
177+
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
178178
setupDiscriminator = mDiscriminator;
179179
return CHIP_NO_ERROR;
180180
}
181181

182182
CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pIterationCount(uint32_t & iterationCount)
183183
{
184-
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_WELL_UNINITIALIZED);
184+
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
185185
iterationCount = mPaseIterationCount;
186186
return CHIP_NO_ERROR;
187187
}
188188

189189
CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pSalt(chip::MutableByteSpan & saltBuf)
190190
{
191-
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_WELL_UNINITIALIZED);
191+
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
192192

193193
VerifyOrReturnError(saltBuf.size() >= kSpake2p_Max_PBKDF_Salt_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
194194
memcpy(saltBuf.data(), mPaseSalt.data(), mPaseSalt.size());
@@ -199,7 +199,7 @@ CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pSalt(chip::MutableByteSpan
199199

200200
CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pVerifier(chip::MutableByteSpan & verifierBuf, size_t & outVerifierLen)
201201
{
202-
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_WELL_UNINITIALIZED);
202+
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
203203

204204
// By now, serialized verifier from Init should be correct size
205205
VerifyOrReturnError(mSerializedPaseVerifier.size() == kSpake2p_VerifierSerialized_Length, CHIP_ERROR_INTERNAL);
@@ -214,7 +214,7 @@ CHIP_ERROR LinuxCommissionableDataProvider::GetSpake2pVerifier(chip::MutableByte
214214

215215
CHIP_ERROR LinuxCommissionableDataProvider::GetSetupPasscode(uint32_t & setupPasscode)
216216
{
217-
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_WELL_UNINITIALIZED);
217+
VerifyOrReturnError(mIsInitialized == true, CHIP_ERROR_UNINITIALIZED);
218218

219219
// Pretend not implemented if we don't have a passcode value externally set
220220
if (!mSetupPasscode.HasValue())

‎src/controller/ExampleOperationalCredentialsIssuer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ CHIP_ERROR ExampleOperationalCredentialsIssuer::GenerateNOCChain(const ByteSpan
323323
const ByteSpan & PAI,
324324
Callback::Callback<OnNOCChainGeneration> * onCompletion)
325325
{
326-
VerifyOrReturnError(mInitialized, CHIP_ERROR_WELL_UNINITIALIZED);
326+
VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
327327
// At this point, Credential issuer may wish to validate the CSR information
328328
(void) attestationChallenge;
329329
(void) csrNonce;

‎src/credentials/DeviceAttestationVendorReserved.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class DeviceAttestationVendorReservedDeconstructor
8888
*/
8989
CHIP_ERROR GetNextVendorReservedElement(struct VendorReservedElement & element)
9090
{
91-
VerifyOrReturnError(mIsInitialized, CHIP_ERROR_WELL_UNINITIALIZED);
91+
VerifyOrReturnError(mIsInitialized, CHIP_ERROR_UNINITIALIZED);
9292
if (mIsDone)
9393
{
9494
return CHIP_END_OF_TLV;

‎src/crypto/CHIPCryptoPALOpenSSL.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, const size_t msg_len
698698
ERR_clear_error();
699699

700700
static_assert(P256ECDSASignature::Capacity() >= kP256_ECDSA_Signature_Length_Raw, "P256ECDSASignature must be large enough");
701-
VerifyOrExit(mInitialized, error = CHIP_ERROR_WELL_UNINITIALIZED);
701+
VerifyOrExit(mInitialized, error = CHIP_ERROR_UNINITIALIZED);
702702
nid = _nidForCurve(MapECName(mPublicKey.Type()));
703703
VerifyOrExit(nid != NID_undef, error = CHIP_ERROR_INVALID_ARGUMENT);
704704

@@ -917,7 +917,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
917917
EC_KEY * ec_key = EC_KEY_dup(to_const_EC_KEY(&mKeypair));
918918
VerifyOrExit(ec_key != nullptr, error = CHIP_ERROR_INTERNAL);
919919

920-
VerifyOrExit(mInitialized, error = CHIP_ERROR_WELL_UNINITIALIZED);
920+
VerifyOrExit(mInitialized, error = CHIP_ERROR_UNINITIALIZED);
921921

922922
local_key = EVP_PKEY_new();
923923
VerifyOrExit(local_key != nullptr, error = CHIP_ERROR_INTERNAL);
@@ -1197,7 +1197,7 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * out_csr, size_t &
11971197
X509_NAME * subject = X509_NAME_new();
11981198
VerifyOrExit(subject != nullptr, error = CHIP_ERROR_INTERNAL);
11991199

1200-
VerifyOrExit(mInitialized, error = CHIP_ERROR_WELL_UNINITIALIZED);
1200+
VerifyOrExit(mInitialized, error = CHIP_ERROR_UNINITIALIZED);
12011201

12021202
result = X509_REQ_set_version(x509_req, 0);
12031203
VerifyOrExit(result == 1, error = CHIP_ERROR_INTERNAL);

‎src/crypto/CHIPCryptoPALPSA.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ static int CryptoRNG(void * ctxt, uint8_t * out_buffer, size_t out_length)
479479

480480
CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, const size_t msg_length, P256ECDSASignature & out_signature) const
481481
{
482-
VerifyOrReturnError(mInitialized, CHIP_ERROR_WELL_UNINITIALIZED);
482+
VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
483483
VerifyOrReturnError(isBufferNonEmpty(msg, msg_length), CHIP_ERROR_INVALID_ARGUMENT);
484484

485485
CHIP_ERROR error = CHIP_NO_ERROR;
@@ -558,7 +558,7 @@ CHIP_ERROR P256PublicKey::ECDSA_validate_hash_signature(const uint8_t * hash, co
558558

559559
CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_key, P256ECDHDerivedSecret & out_secret) const
560560
{
561-
VerifyOrReturnError(mInitialized, CHIP_ERROR_WELL_UNINITIALIZED);
561+
VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
562562

563563
CHIP_ERROR error = CHIP_NO_ERROR;
564564
psa_status_t status = PSA_SUCCESS;
@@ -728,7 +728,7 @@ P256Keypair::~P256Keypair()
728728
CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * out_csr, size_t & csr_length) const
729729
{
730730
VerifyOrReturnError(isBufferNonEmpty(out_csr, csr_length), CHIP_ERROR_INVALID_ARGUMENT);
731-
VerifyOrReturnError(mInitialized, CHIP_ERROR_WELL_UNINITIALIZED);
731+
VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
732732

733733
MutableByteSpan csr(out_csr, csr_length);
734734
ReturnErrorOnFailure(GenerateCertificateSigningRequest(this, csr));

‎src/crypto/CHIPCryptoPALmbedTLS.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ static inline const mbedtls_ecp_keypair * to_const_keypair(const P256KeypairCont
450450

451451
CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, const size_t msg_length, P256ECDSASignature & out_signature) const
452452
{
453-
VerifyOrReturnError(mInitialized, CHIP_ERROR_WELL_UNINITIALIZED);
453+
VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
454454
VerifyOrReturnError((msg != nullptr) && (msg_length > 0), CHIP_ERROR_INVALID_ARGUMENT);
455455

456456
uint8_t digest[kSHA256_Hash_Length];
@@ -593,7 +593,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
593593

594594
const mbedtls_ecp_keypair * keypair = to_const_keypair(&mKeypair);
595595

596-
VerifyOrExit(mInitialized, error = CHIP_ERROR_WELL_UNINITIALIZED);
596+
VerifyOrExit(mInitialized, error = CHIP_ERROR_UNINITIALIZED);
597597

598598
result = mbedtls_ecp_group_load(&ecp_grp, MapECPGroupId(remote_public_key.Type()));
599599
VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
@@ -787,7 +787,7 @@ CHIP_ERROR P256Keypair::NewCertificateSigningRequest(uint8_t * out_csr, size_t &
787787
pk.CHIP_CRYPTO_PAL_PRIVATE(pk_ctx) = to_keypair(&mKeypair);
788788
VerifyOrExit(pk.CHIP_CRYPTO_PAL_PRIVATE(pk_info) != nullptr, error = CHIP_ERROR_INTERNAL);
789789

790-
VerifyOrExit(mInitialized, error = CHIP_ERROR_WELL_UNINITIALIZED);
790+
VerifyOrExit(mInitialized, error = CHIP_ERROR_UNINITIALIZED);
791791

792792
mbedtls_x509write_csr_set_key(&csr, &pk);
793793

‎src/include/platform/KeyValueStoreManager.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class KeyValueStoreManager
6969
* CHIP_ERROR_BUFFER_TOO_SMALL the buffer could not fit the entire
7070
* value, but as many bytes as possible
7171
* were written to it
72-
* CHIP_ERROR_WELL_UNINITIALIZED the KVS is not initialized
72+
* CHIP_ERROR_UNINITIALIZED the KVS is not initialized
7373
* CHIP_ERROR_INVALID_ARGUMENT key is empty or too long or value is
7474
* too large
7575
*/
@@ -93,7 +93,7 @@ class KeyValueStoreManager
9393
* CHIP_ERROR_BUFFER_TOO_SMALL the buffer could not fit the entire
9494
* value, but as many bytes as possible
9595
* were written to it
96-
* CHIP_ERROR_WELL_UNINITIALIZED the KVS is not initialized
96+
* CHIP_ERROR_UNINITIALIZED the KVS is not initialized
9797
* CHIP_ERROR_INVALID_ARGUMENT key is empty or too long or value is
9898
* too large
9999
*/
@@ -120,7 +120,7 @@ class KeyValueStoreManager
120120
* CHIP_ERROR_INTEGRITY_CHECK_FAILED checksum validation failed after
121121
* writing the data
122122
* CHIP_ERROR_PERSISTED_STORAGE_FAILED failed to write the value.
123-
* CHIP_ERROR_WELL_UNINITIALIZED the KVS is not initialized
123+
* CHIP_ERROR_UNINITIALIZED the KVS is not initialized
124124
* CHIP_ERROR_INVALID_ARGUMENT key is empty or too long or value is
125125
* too large
126126
*/
@@ -139,7 +139,7 @@ class KeyValueStoreManager
139139
* CHIP_ERROR_INTEGRITY_CHECK_FAILED checksum validation failed after
140140
* writing the data
141141
* CHIP_ERROR_PERSISTED_STORAGE_FAILED failed to write the value.
142-
* CHIP_ERROR_WELL_UNINITIALIZED the KVS is not initialized
142+
* CHIP_ERROR_UNINITIALIZED the KVS is not initialized
143143
* CHIP_ERROR_INVALID_ARGUMENT key is empty or too long or value is
144144
* too large
145145
*/
@@ -165,7 +165,7 @@ class KeyValueStoreManager
165165
* CHIP_ERROR_INTEGRITY_CHECK_FAILED checksum validation failed after
166166
* erasing data
167167
* CHIP_ERROR_PERSISTED_STORAGE_FAILED failed to erase the value.
168-
* CHIP_ERROR_WELL_UNINITIALIZED the KVS is not initialized
168+
* CHIP_ERROR_UNINITIALIZED the KVS is not initialized
169169
* CHIP_ERROR_INVALID_ARGUMENT key is empty or too long
170170
*/
171171
CHIP_ERROR Delete(const char * key);

‎src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.ipp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ template <class ImplClass>
209209
CHIP_ERROR GenericPlatformManagerImpl_Zephyr<ImplClass>::_StartEventLoopTask(void)
210210
{
211211
if (!mChipThreadStack)
212-
return CHIP_ERROR_WELL_UNINITIALIZED;
212+
return CHIP_ERROR_UNINITIALIZED;
213213

214214
const auto tid = k_thread_create(&mChipThread, mChipThreadStack, CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE, EventLoopTaskMain,
215215
this, nullptr, nullptr, CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY, 0, K_NO_WAIT);

‎src/lib/address_resolve/AddressResolve.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class Resolver
225225
/// This method will return CHIP_ERROR_INCORRECT_STATE if the handle is
226226
/// still active.
227227
///
228-
/// This method will return CHIP_ERROR_WELL_EMPTY if there are no more
228+
/// This method will return CHIP_ERROR_EMPTY if there are no more
229229
/// results.
230230
///
231231
/// This method may return other errors in some cases.

‎src/lib/address_resolve/AddressResolve_DefaultImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ CHIP_ERROR Resolver::LookupNode(const NodeLookupRequest & request, Impl::NodeLoo
195195
CHIP_ERROR Resolver::TryNextResult(Impl::NodeLookupHandle & handle)
196196
{
197197
VerifyOrReturnError(!mActiveLookups.Contains(&handle), CHIP_ERROR_INCORRECT_STATE);
198-
VerifyOrReturnError(handle.HasLookupResult(), CHIP_ERROR_WELL_EMPTY);
198+
VerifyOrReturnError(handle.HasLookupResult(), CHIP_ERROR_EMPTY);
199199

200200
auto listener = handle.GetListener();
201201
auto peerId = handle.GetRequest().GetPeerId();

‎src/lib/core/CHIPError.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,17 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
140140
case CHIP_ERROR_WRONG_KEY_TYPE.AsInteger():
141141
desc = "Wrong key type";
142142
break;
143-
case CHIP_ERROR_WELL_UNINITIALIZED.AsInteger():
144-
desc = "Well uninitialized";
143+
case CHIP_ERROR_UNINITIALIZED.AsInteger():
144+
desc = "Uninitialized";
145145
break;
146-
case CHIP_ERROR_WELL_EMPTY.AsInteger():
147-
desc = "Well empty";
146+
case CHIP_ERROR_EMPTY.AsInteger():
147+
desc = "Empty";
148148
break;
149149
case CHIP_ERROR_INVALID_STRING_LENGTH.AsInteger():
150150
desc = "Invalid string length";
151151
break;
152152
case CHIP_ERROR_INVALID_LIST_LENGTH.AsInteger():
153-
desc = "invalid list length";
153+
desc = "Invalid list length";
154154
break;
155155
case CHIP_END_OF_TLV.AsInteger():
156156
desc = "End of TLV";

‎src/lib/core/CHIPError.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -666,22 +666,22 @@ using CHIP_ERROR = ::chip::ChipError;
666666
#define CHIP_ERROR_WRONG_KEY_TYPE CHIP_CORE_ERROR(0x1b)
667667

668668
/**
669-
* @def CHIP_ERROR_WELL_UNINITIALIZED
669+
* @def CHIP_ERROR_UNINITIALIZED
670670
*
671671
* @brief
672672
* A requested object is uninitialized.
673673
*
674674
*/
675-
#define CHIP_ERROR_WELL_UNINITIALIZED CHIP_CORE_ERROR(0x1c)
675+
#define CHIP_ERROR_UNINITIALIZED CHIP_CORE_ERROR(0x1c)
676676

677677
/**
678-
* @def CHIP_ERROR_WELL_EMPTY
678+
* @def CHIP_ERROR_EMPTY
679679
*
680680
* @brief
681681
* A requested object is empty.
682682
*
683683
*/
684-
#define CHIP_ERROR_WELL_EMPTY CHIP_CORE_ERROR(0x1d)
684+
#define CHIP_ERROR_EMPTY CHIP_CORE_ERROR(0x1d)
685685

686686
/**
687687
* @def CHIP_ERROR_INVALID_STRING_LENGTH

‎src/lib/core/tests/TestCHIPErrorStr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ static const CHIP_ERROR kTestElements[] =
7676
CHIP_ERROR_BUFFER_TOO_SMALL,
7777
CHIP_ERROR_DUPLICATE_KEY_ID,
7878
CHIP_ERROR_WRONG_KEY_TYPE,
79-
CHIP_ERROR_WELL_UNINITIALIZED,
80-
CHIP_ERROR_WELL_EMPTY,
79+
CHIP_ERROR_UNINITIALIZED,
80+
CHIP_ERROR_EMPTY,
8181
CHIP_ERROR_INVALID_STRING_LENGTH,
8282
CHIP_ERROR_INVALID_LIST_LENGTH,
8383
CHIP_END_OF_TLV,

‎src/lib/dnssd/Discovery_ImplPlatform.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ CHIP_ERROR CopyTextRecordValue(char * buffer, size_t bufferLen, CommissioningMod
163163
template <class T>
164164
CHIP_ERROR CopyTextRecordValue(char * buffer, size_t bufferLen, chip::Optional<T> value)
165165
{
166-
VerifyOrReturnError(value.HasValue(), CHIP_ERROR_WELL_UNINITIALIZED);
166+
VerifyOrReturnError(value.HasValue(), CHIP_ERROR_UNINITIALIZED);
167167
return CopyTextRecordValue(buffer, bufferLen, value.Value());
168168
}
169169

170170
CHIP_ERROR CopyTextRecordValue(char * buffer, size_t bufferLen, chip::Optional<uint16_t> value1, chip::Optional<uint16_t> value2)
171171
{
172-
VerifyOrReturnError(value1.HasValue(), CHIP_ERROR_WELL_UNINITIALIZED);
172+
VerifyOrReturnError(value1.HasValue(), CHIP_ERROR_UNINITIALIZED);
173173
return value2.HasValue() ? CopyTextRecordValue(buffer, bufferLen, value1.Value(), value2.Value())
174174
: CopyTextRecordValue(buffer, bufferLen, value1.Value());
175175
}
@@ -180,7 +180,7 @@ CHIP_ERROR CopyTextRecordValue(char * buffer, size_t bufferLen, const chip::Opti
180180
VerifyOrReturnError((key == TxtFieldKey::kSessionIdleInterval || key == TxtFieldKey::kSessionActiveInterval ||
181181
key == TxtFieldKey::kSessionActiveThreshold),
182182
CHIP_ERROR_INVALID_ARGUMENT);
183-
VerifyOrReturnError(optional.HasValue(), CHIP_ERROR_WELL_UNINITIALIZED);
183+
VerifyOrReturnError(optional.HasValue(), CHIP_ERROR_UNINITIALIZED);
184184

185185
CHIP_ERROR err;
186186
if (key == TxtFieldKey::kSessionActiveThreshold)
@@ -215,9 +215,9 @@ CHIP_ERROR CopyTxtRecord(TxtFieldKey key, char * buffer, size_t bufferLen, const
215215
// A ICD operating as a LIT should not advertise its slow polling interval
216216
if (params.GetICDOperatingAsLIT().HasValue() && params.GetICDOperatingAsLIT().Value())
217217
{
218-
// returning WELL_UNINITIALIZED ensures that the SII string isn't added by the AddTxtRecord
218+
// Returning UNINITIALIZED ensures that the SII string isn't added by the AddTxtRecord
219219
// without erroring out the action.
220-
return CHIP_ERROR_WELL_UNINITIALIZED;
220+
return CHIP_ERROR_UNINITIALIZED;
221221
}
222222
FALLTHROUGH;
223223
#endif
@@ -261,7 +261,7 @@ CHIP_ERROR AddTxtRecord(TxtFieldKey key, TextEntry * entries, size_t & entriesCo
261261
const T & params)
262262
{
263263
CHIP_ERROR error = CopyTxtRecord(key, buffer, bufferLen, params);
264-
VerifyOrReturnError(CHIP_ERROR_WELL_UNINITIALIZED != error, CHIP_NO_ERROR);
264+
VerifyOrReturnError(CHIP_ERROR_UNINITIALIZED != error, CHIP_NO_ERROR);
265265
VerifyOrReturnError(CHIP_NO_ERROR == error, error);
266266

267267
entries[entriesCount++] = { Internal::txtFieldInfo[static_cast<int>(key)].keyStr, reinterpret_cast<const uint8_t *>(buffer),

‎src/lib/shell/commands/Dns.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class DnsShellResolverDelegate : public Dnssd::CommissioningResolveDelegate, pub
6767
// Schedule a retry. Not called directly so we do not recurse in OnNodeAddressResolved
6868
DeviceLayer::SystemLayer().ScheduleLambda([this] {
6969
CHIP_ERROR err = AddressResolve::Resolver::Instance().TryNextResult(Handle());
70-
if (err != CHIP_NO_ERROR && err != CHIP_ERROR_WELL_EMPTY)
70+
if (err != CHIP_NO_ERROR && err != CHIP_ERROR_EMPTY)
7171
{
7272
ChipLogError(Discovery, "Failed to list next result: %" CHIP_ERROR_FORMAT, err.Format());
7373
}

0 commit comments

Comments
 (0)