summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-12-18 20:30:01 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-12-18 20:30:01 (GMT)
commit8427b5267e698b134e93e87f3a19b6ce3101c186 (patch)
treee113f58ae6bb827a5f4855da034442ef6309560f /test
parent1fc171a655af0984c0d749949bc9fb3a58a298ba (diff)
downloadhdf5-8427b5267e698b134e93e87f3a19b6ce3101c186.zip
hdf5-8427b5267e698b134e93e87f3a19b6ce3101c186.tar.gz
hdf5-8427b5267e698b134e93e87f3a19b6ce3101c186.tar.bz2
Adjust cache.c only variables.
Diffstat (limited to 'test')
-rw-r--r--test/cache.c3
-rw-r--r--test/cache_common.c2
-rw-r--r--test/cache_common.h3
3 files changed, 4 insertions, 4 deletions
diff --git a/test/cache.c b/test/cache.c
index 5041aa7..4f61917 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -18,6 +18,7 @@
* H5C.c
*/
#include "cache_common.h"
+#include "H5MFprivate.h"
H5C_t * saved_cache = NULL; /* store the pointer to the instance of
@@ -44,9 +45,11 @@ hid_t saved_fcpl_id = H5P_DEFAULT; /* store the fcpl id here between
* 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;
hbool_t skip_long_tests;
diff --git a/test/cache_common.c b/test/cache_common.c
index afbb653..bd3ffd6 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -18,10 +18,8 @@
* implemented in H5C.c
*/
#include "H5private.h" /* Put this first, so H5open() isn't invoked in public macros */
-#include "H5MFprivate.h"
#include "cache_common.h"
-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 b255ac6..2d8f09c 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -163,7 +163,7 @@ typedef struct flush_op
hbool_t flag; /* boolean flag passed into the
* function implementing the flush
* operation. The meaning of the
- * flag is dependant upon the flush
+ * flag is dependent upon the flush
* operation:
*
* FLUSH_OP__DIRTY: TRUE iff the
@@ -476,7 +476,6 @@ struct expected_entry_status
/* global variable externs: */
-extern hbool_t write_permitted;
extern hbool_t pass; /* set to false on error */
extern const char *failure_mssg;