feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

nvs_flash: remove leftover ESP_ERROR_CHECKS

Browse Source 
Similar to the asserts, these are replaced by error checks.
This commit is contained in:
Ivan Grokhotkov
2022-08-15 23:28:07 +02:00
parent 02661081be
commit bee241b0e2
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/nvs_flash/src/nvs_pagemanager.cpp
View File

@@ -47,7 +47,10 @@ esp_err_t PageManager::load(Partition *partition, uint32_t baseSector, uint32_t
return activatePage(); return activatePage();
} else { } else {
uint32_t lastSeqNo; uint32_t lastSeqNo;
ESP_ERROR_CHECK( mPageList.back().getSeqNumber(lastSeqNo) ); auto err = mPageList.back().getSeqNumber(lastSeqNo);
if (err != ESP_OK) {
return err;
}
mSeqNumber = lastSeqNo + 1; mSeqNumber = lastSeqNo + 1;
} }

10
components/nvs_flash/src/nvs_storage.cpp
View File

@@ -305,7 +305,10 @@ esp_err_t Storage::writeItem(uint8_t nsIndex, ItemType datatype, const char* key
if (findPage->state() == Page::PageState::UNINITIALIZED || if (findPage->state() == Page::PageState::UNINITIALIZED ||
findPage->state() == Page::PageState::INVALID) { findPage->state() == Page::PageState::INVALID) {
ESP_ERROR_CHECK(findItem(nsIndex, datatype, key, findPage, item)); err = findItem(nsIndex, datatype, key, findPage, item);
if (err != ESP_OK) {
return err;
}
} }
/* Get the version of the previous index with same <ns,key> */ /* Get the version of the previous index with same <ns,key> */
prevStart = item.blobIndex.chunkStart; prevStart = item.blobIndex.chunkStart;
@@ -383,7 +386,10 @@ esp_err_t Storage::writeItem(uint8_t nsIndex, ItemType datatype, const char* key
if (findPage) { if (findPage) {
if (findPage->state() == Page::PageState::UNINITIALIZED || if (findPage->state() == Page::PageState::UNINITIALIZED ||
findPage->state() == Page::PageState::INVALID) { findPage->state() == Page::PageState::INVALID) {
ESP_ERROR_CHECK(findItem(nsIndex, datatype, key, findPage, item)); err = findItem(nsIndex, datatype, key, findPage, item);
if (err != ESP_OK) {
return err;
}
} }
err = findPage->eraseItem(nsIndex, datatype, key); err = findPage->eraseItem(nsIndex, datatype, key);
if (err == ESP_ERR_FLASH_OP_FAIL) { if (err == ESP_ERR_FLASH_OP_FAIL) {