summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-12-18 20:29:46 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-12-18 20:29:46 (GMT)
commitb89d4280876fcbc280fb694e218afa6fa5f67e1d (patch)
treed6e007b106b2b5e7e32daccb80b6a928ce58a67a /test
parent527105012bd5836998ca9d476bd7aa07c9d3f8d4 (diff)
downloadhdf5-b89d4280876fcbc280fb694e218afa6fa5f67e1d.zip
hdf5-b89d4280876fcbc280fb694e218afa6fa5f67e1d.tar.gz
hdf5-b89d4280876fcbc280fb694e218afa6fa5f67e1d.tar.bz2
Adjust cache.c only variables.
Diffstat (limited to 'test')
-rw-r--r--test/cache.c39
-rw-r--r--test/cache_common.c12
-rw-r--r--test/cache_common.h4
3 files changed, 26 insertions, 29 deletions
diff --git a/test/cache.c b/test/cache.c
index c1af1b2..a90f12b 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 2e24bda..f977c3c 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 61457d9..969cc2a 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -538,10 +538,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;