summaryrefslogtreecommitdiffstats
path: root/test/cache.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2017-02-20 04:33:22 (GMT)
committerQuincey Koziol <koziol@lbl.gov>2017-02-20 04:33:22 (GMT)
commit2c2fb928daa8fa82930f78d00f9ee0dcad70d35a (patch)
tree5fdb1f02dd14a502cffa330b69c0b87a9fc68e2f /test/cache.c
parent7e4b64bd834c95fee396aabc2cb73227f7baf873 (diff)
parent101fa7af8ebe26ad015b64d3b881df8a9124ccc2 (diff)
downloadhdf5-2c2fb928daa8fa82930f78d00f9ee0dcad70d35a.zip
hdf5-2c2fb928daa8fa82930f78d00f9ee0dcad70d35a.tar.gz
hdf5-2c2fb928daa8fa82930f78d00f9ee0dcad70d35a.tar.bz2
Merge pull request #302 in HDFFV/hdf5 from merge_page_buffering_02 to develop
* commit '101fa7af8ebe26ad015b64d3b881df8a9124ccc2': Cleanups and normalizations against incoming page_buffering changes. Switch major error code from H5E_FSPACE [back] to H5E_RESOURCE Misc. style cleanups from the page_buffering branch.
Diffstat (limited to 'test/cache.c')
-rw-r--r--test/cache.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/test/cache.c b/test/cache.c
index a2bfa91..d09a122 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -15898,7 +15898,6 @@ check_destroy_pinned_err(void)
* should fail. Unpin the entry and flush destroy again -- should
* succeed.
*/
-
if(pass) {
reset_entries();
@@ -15909,7 +15908,7 @@ check_destroy_pinned_err(void)
protect_entry(file_ptr, 0, 0);
unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
- if(H5C_prep_for_file_close(file_ptr, H5P_DATASET_XFER_DEFAULT) < 0 ) {
+ if(H5C_prep_for_file_close(file_ptr, H5P_DATASET_XFER_DEFAULT) < 0) {
pass = FALSE;
failure_mssg = "unexpected failure of prep for file close.\n";
} /* end if */
@@ -15925,9 +15924,8 @@ check_destroy_pinned_err(void)
pass = FALSE;
failure_mssg = "destroy failed after unpin.\n";
} /* end if */
- else {
+ else
file_ptr->shared->cache = NULL;
- } /* end else */
} /* end else */
if(saved_cache != NULL) {
@@ -15989,16 +15987,16 @@ check_destroy_protected_err(void)
file_ptr = setup_cache((size_t)(2 * 1024),
(size_t)(1 * 1024));
- /* Note: normally this call would go just before the series of
- * flushes prior to file close -- in particular, all entries
+ /* Note: normally this call would go just before the series of
+ * flushes prior to file close -- in particular, all entries
* should be unprotected when this call is made.
*
* Thus H5C_prep_for_file_close() contains an assert to verify
- * this. Since this assert would be triggered by the condition
+ * this. Since this assert would be triggered by the condition
* we are trying to test, put the call to H5C_prep_for_file_close()
* prior to the final protect call.
*/
- if(H5C_prep_for_file_close(file_ptr, H5P_DATASET_XFER_DEFAULT) < 0 ) {
+ if(H5C_prep_for_file_close(file_ptr, H5P_DATASET_XFER_DEFAULT) < 0) {
pass = FALSE;
failure_mssg = "unexpected failure of prep for file close.\n";
} /* end if */
@@ -28154,8 +28152,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
}
if(show_progress) /* 0 */
- HDfprintf(stdout, "\n%s: check point %d -- pass %d\n",
- FUNC, checkpoint++, pass);
+ HDfprintf(stdout, "\n%s: check point %d -- pass %d\n", FUNC, checkpoint++, pass);
if(pass) {