From ce35ebecfb51fd09b0248fb0388917aec43e261e Mon Sep 17 00:00:00 2001 From: Neil Fortner Date: Wed, 13 Apr 2011 16:03:30 -0500 Subject: [svn-r20491] Rename H5Frelease_file_cache to H5Fclear_elink_file_cache. Tested: Fedora (too minor for full committest) --- release_docs/RELEASE.txt | 2 +- src/H5F.c | 8 ++++---- src/H5Fpublic.h | 2 +- test/links.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 7766ee1..d060630 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -87,7 +87,7 @@ New Features -------- - Added ability to cache files opened through external links. Added new public functions H5Pset_elink_file_cache_size(), - H5Pget_elink_file_cache_size(), and H5Frelease_file_cache(). + H5Pget_elink_file_cache_size(), and H5Fclear_elink_file_cache(). (NAF - 2011/02/17) - Removed all old code for Metraowerks compilers, bracketed by __MWERKS__). Metraowerks compiler is long gone. (AKC - 2010/11/17) diff --git a/src/H5F.c b/src/H5F.c index 2cec64d..5b3c84b 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -2951,7 +2951,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5Frelease_file_cache + * Function: H5Fclear_elink_file_cache * * Purpose: Releases the external file cache associated with the * provided file, potentially closing any cached files @@ -2965,12 +2965,12 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Frelease_file_cache(hid_t file_id) +H5Fclear_elink_file_cache(hid_t file_id) { H5F_t *file; /* File */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Frelease_file_cache, FAIL) + FUNC_ENTER_API(H5Fclear_elink_file_cache, FAIL) H5TRACE1("e", "i", file_id); /* Check args */ @@ -2984,5 +2984,5 @@ H5Frelease_file_cache(hid_t file_id) done: FUNC_LEAVE_API(ret_value) -} /* end H5Frelease_file_cache() */ +} /* end H5Fclear_elink_file_cache() */ diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index d87dae6..d1effb6 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -198,7 +198,7 @@ H5_DLL ssize_t H5Fget_name(hid_t obj_id, char *name, size_t size); H5_DLL herr_t H5Fget_info2(hid_t obj_id, H5F_info2_t *finfo); H5_DLL ssize_t H5Fget_free_sections(hid_t file_id, H5F_mem_t type, size_t nsects, H5F_sect_info_t *sect_info/*out*/); -H5_DLL herr_t H5Frelease_file_cache(hid_t file_id); +H5_DLL herr_t H5Fclear_elink_file_cache(hid_t file_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. * diff --git a/test/links.c b/test/links.c index 50801c0..236bb10 100644 --- a/test/links.c +++ b/test/links.c @@ -6799,7 +6799,7 @@ external_file_cache(hid_t fapl, hbool_t new_format) TEST_ERROR /* Release file 1's EFC */ - if(H5Frelease_file_cache(fid1) < 0) + if(H5Fclear_elink_file_cache(fid1) < 0) TEST_ERROR /* Verify that only the parent file is now open */ @@ -6937,7 +6937,7 @@ external_file_cache(hid_t fapl, hbool_t new_format) TEST_ERROR /* Release file 1's EFC */ - if(H5Frelease_file_cache(fid1) < 0) + if(H5Fclear_elink_file_cache(fid1) < 0) TEST_ERROR /* Verify that only file 1 is now open */ @@ -7047,7 +7047,7 @@ external_file_cache(hid_t fapl, hbool_t new_format) TEST_ERROR /* Release file 1's EFC */ - if(H5Frelease_file_cache(fid1) < 0) + if(H5Fclear_elink_file_cache(fid1) < 0) TEST_ERROR /* Verify that only file 1 is now open */ -- cgit v0.12