Restoring swap code to cfstore_test_delete_all() after being previously removed to work around CFSTORE issue 17/23 (realloc()).

simonqhughes · adbridge · commit c0b0ac66f594 · 2016-09-15T18:07:12.000+01:00
diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_test.c b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_test.c
@@ -374,11 +374,7 @@ int32_t cfstore_test_delete_all(void)
             CFSTORE_ERRLOG("%s:Error: failed to delete key_name=%s, len=%d\r\n", __func__, key_name, (int) len);
             return ret;
         }
-        ret = drv->Close(next);
-        if(ret < ARM_DRIVER_OK){
-            CFSTORE_ERRLOG("%s:Error: failed to close key_name=%s, len=%d\r\n", __func__, key_name, (int) len);
-            return ret;
-        }
+        CFSTORE_HANDLE_SWAP(prev, next);
     }
     if(ret == ARM_CFSTORE_DRIVER_ERROR_KEY_NOT_FOUND) {
         /* as expected, no more keys have been found by the Find()*/

Original file line number	Diff line number	Diff line change
`@@ -374,11 +374,7 @@ int32_t cfstore_test_delete_all(void)`
`374`	`374`	`CFSTORE_ERRLOG("%s:Error: failed to delete key_name=%s, len=%d\r\n", __func__, key_name, (int) len);`
`375`	`375`	`return ret;`
`376`	`376`	`}`
`377`		`- ret = drv->Close(next);`
`378`		`- if(ret < ARM_DRIVER_OK){`
`379`		`- CFSTORE_ERRLOG("%s:Error: failed to close key_name=%s, len=%d\r\n", __func__, key_name, (int) len);`
`380`		`- return ret;`
`381`		`- }`
	`377`	`+ CFSTORE_HANDLE_SWAP(prev, next);`
`382`	`378`	`}`
`383`	`379`	`if(ret == ARM_CFSTORE_DRIVER_ERROR_KEY_NOT_FOUND) {`
`384`	`380`	`/* as expected, no more keys have been found by the Find()*/`