Adjust cache.c only variables.

This commit is contained in:
Allen Byrne
2019-12-18 14:30:20 -06:00
parent 0dc2715ece
commit 4e4b0af0d7
3 changed files with 26 additions and 29 deletions

View File

@@ -21,22 +21,35 @@
#include "H5MFprivate.h"
H5C_t * saved_cache = NULL; /* store the pointer to the instance of
* of H5C_t created by H5Fcreate()
* here between test cache setup and
* shutdown.
*/
haddr_t saved_actual_base_addr = HADDR_UNDEF; /* Store the address of the
* space allocated for cache items in the file between
* cache setup & takedown
*/
hid_t saved_fapl_id = H5P_DEFAULT; /* store the fapl id here between
* cache setup and takedown. Note
* that if saved_fapl_id == H5P_DEFAULT,
* we assume that there is no fapl to
* close.
*/
* cache setup and takedown. Note
* that if saved_fapl_id == H5P_DEFAULT,
* we assume that there is no fapl to
* close.
*/
hid_t saved_fcpl_id = H5P_DEFAULT; /* store the fcpl id here between
* cache setup and takedown. Note
* that if saved_fcpl_id == H5P_DEFAULT,
* we assume that there is no fcpl to
* close.
*/
hid_t saved_fid = -1; /* store the file id here between cache setup
* and takedown.
*/
* cache setup and takedown. Note
* that if saved_fcpl_id == H5P_DEFAULT,
* we assume that there is no fcpl to
* close.
*/
hid_t saved_fid = -1; /* store the file id here between cache setup
* and takedown.
*/
hbool_t write_permitted = TRUE;
hbool_t try_core_file_driver = FALSE;
hbool_t core_file_driver_failed = FALSE;

View File

@@ -22,18 +22,6 @@
#include "cache_common.h"
H5C_t * saved_cache = NULL; /* store the pointer to the instance of
* of H5C_t created by H5Fcreate()
* here between test cache setup and
* shutdown.
*/
haddr_t saved_actual_base_addr = HADDR_UNDEF; /* Store the address of the
space allocated for cache items in the file between
cache setup & takedown */
hbool_t write_permitted = TRUE;
hbool_t pass = TRUE; /* set to false on error */
const char *failure_mssg = NULL;

View File

@@ -537,10 +537,6 @@ struct expected_entry_status
/* global variable externs: */
H5TEST_DLLVAR H5C_t * saved_cache;
H5TEST_DLLVAR haddr_t saved_actual_base_addr;
H5TEST_DLLVAR hbool_t write_permitted;
H5TEST_DLLVAR hbool_t pass; /* set to false on error */
H5TEST_DLLVAR const char *failure_mssg;