summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorkmu <kmu@hdfgroup.org>2020-01-23 01:46:12 (GMT)
committerkmu <kmu@hdfgroup.org>2020-01-23 01:46:12 (GMT)
commit145ef3ceee20c28a443bd11507c58858bea3f889 (patch)
treea899cd31150c9642b74ff79e88b76c0c5f228f1f /test
parent9be5b2842e307f5f5b67c7e42217ddff67b0bf61 (diff)
downloadhdf5-145ef3ceee20c28a443bd11507c58858bea3f889.zip
hdf5-145ef3ceee20c28a443bd11507c58858bea3f889.tar.gz
hdf5-145ef3ceee20c28a443bd11507c58858bea3f889.tar.bz2
more cleanup
Diffstat (limited to 'test')
-rw-r--r--test/cache_common.c2
-rw-r--r--test/mf.c7
-rw-r--r--test/page_buffer.c4
-rw-r--r--test/tselect.c2
4 files changed, 6 insertions, 9 deletions
diff --git a/test/cache_common.c b/test/cache_common.c
index 696eae3..038a0ed 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -17,9 +17,9 @@
* This file contains common code for tests of the cache
* implemented in H5C.c
*/
+#include "H5private.h"
#include "H5CXprivate.h" /* API Contexts */
#include "H5MMprivate.h"
-#include "H5private.h"
#include "cache_common.h"
diff --git a/test/mf.c b/test/mf.c
index 6030314..141f5ec 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -38,7 +38,6 @@
#include "H5Iprivate.h"
#include "H5VLprivate.h" /* Virtual Object Layer */
#include "H5VMprivate.h"
-#include "H5private.h"
#define FILENAME_LEN 1024
@@ -7529,7 +7528,7 @@ error:
*-------------------------------------------------------------------------
*/
static int
-set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split)
+set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split)
{
H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
hid_t memb_fapl_arr[H5FD_MEM_NTYPES];
@@ -7538,7 +7537,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split)
hbool_t relax;
H5FD_mem_t mt;
- HDassert(split);
+ HDassert(is_multi_or_split);
HDmemset(memb_name, 0, sizeof memb_name);
@@ -7546,7 +7545,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split)
if(H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0)
TEST_ERROR
- if(split) {
+ if(is_multi_or_split) {
/* Set memb_addr aligned */
memb_addr[H5FD_MEM_SUPER] = ((memb_addr[H5FD_MEM_SUPER] + pagesize - 1) / pagesize) * pagesize;
memb_addr[H5FD_MEM_DRAW] = ((memb_addr[H5FD_MEM_DRAW] + pagesize - 1) / pagesize) * pagesize;
diff --git a/test/page_buffer.c b/test/page_buffer.c
index 79ba43f..21ffbf5 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -299,7 +299,7 @@ error:
} H5E_END_TRY;
return 1;
}
-#endif
+#endif /* H5_HAVE_PARALLEL */
/*
*
@@ -2008,7 +2008,7 @@ error:
return 1;
} /* test_stats_collection */
-#endif
+#endif /* #ifndef H5_HAVE_PARALLEL */
/*-------------------------------------------------------------------------
diff --git a/test/tselect.c b/test/tselect.c
index db7c9de..390f61f 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -25,9 +25,7 @@
#define H5S_TESTING
#include "testhdf5.h"
-#include "hdf5.h"
#include "H5Spkg.h" /* Dataspaces */
-#include "H5private.h"
#define FILENAME "tselect.h5"