diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-18 20:30:20 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-18 20:30:20 (GMT) |
commit | 4e4b0af0d7f9337de5ef408e9ab1d2ef44ca22e6 (patch) | |
tree | 581ec2d9538341d33671e4c3046b1b6052ee29e2 | |
parent | 0dc2715ecebf27c85591ad2a78a6f7fe93386d65 (diff) | |
download | hdf5-4e4b0af0d7f9337de5ef408e9ab1d2ef44ca22e6.zip hdf5-4e4b0af0d7f9337de5ef408e9ab1d2ef44ca22e6.tar.gz hdf5-4e4b0af0d7f9337de5ef408e9ab1d2ef44ca22e6.tar.bz2 |
Adjust cache.c only variables.
-rw-r--r-- | test/cache.c | 39 | ||||
-rw-r--r-- | test/cache_common.c | 12 | ||||
-rw-r--r-- | test/cache_common.h | 4 |
3 files changed, 26 insertions, 29 deletions
diff --git a/test/cache.c b/test/cache.c index cbc7da1..1573e97 100644 --- a/test/cache.c +++ b/test/cache.c @@ -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; diff --git a/test/cache_common.c b/test/cache_common.c index cf5c497..ae2a9cc 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -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; diff --git a/test/cache_common.h b/test/cache_common.h index 8f2aee2..afe1646 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -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; |