summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-10-10 15:10:15 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-10-10 15:10:15 (GMT)
commite962df1591bc6eaee5b9e318de83b9c6698bc7b6 (patch)
treede3cb2001c62b76a89837ff1e90044574d71f19d /testpar
parent471150151d29eeb806333a8db41fefc9dfb452bb (diff)
downloadhdf5-e962df1591bc6eaee5b9e318de83b9c6698bc7b6.zip
hdf5-e962df1591bc6eaee5b9e318de83b9c6698bc7b6.tar.gz
hdf5-e962df1591bc6eaee5b9e318de83b9c6698bc7b6.tar.bz2
VOL FEATURE
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_cache.c2
-rw-r--r--testpar/t_cache_image.c2
-rw-r--r--testpar/t_pread.c28
3 files changed, 16 insertions, 16 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index c27fc23..5e15ec2 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -4091,7 +4091,7 @@ setup_cache_for_test(hid_t * fid_ptr,
world_mpi_rank, FUNC);
}
} else {
- file_ptr = (H5F_t *)H5I_object_verify(fid, H5I_FILE);
+ file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE);
}
if ( file_ptr == NULL ) {
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index 5b512d6..e158d69 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -1187,7 +1187,7 @@ open_hdf5_file(const hbool_t create_file,
} else {
- file_ptr = (struct H5F_t *)H5I_object_verify(file_id, H5I_FILE);
+ file_ptr = (struct H5F_t *)H5VL_object_verify(file_id, H5I_FILE);
if ( file_ptr == NULL ) {
diff --git a/testpar/t_pread.c b/testpar/t_pread.c
index 807e092..0905d44 100644
--- a/testpar/t_pread.c
+++ b/testpar/t_pread.c
@@ -104,7 +104,7 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
hid_t file_id = -1;
hid_t memspace = -1;
hid_t filespace = -1;
- hid_t fctmpl = -1;
+ hid_t fctmpl = -1;
hid_t fapl_id = -1;
hid_t dxpl_id = -1;
hid_t dset_id = -1;
@@ -180,17 +180,17 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
}
}
- /* Initialize a file creation template */
- if (pass) {
- if ((fctmpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
- pass = FALSE;
- failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n";
- }
- else if (H5Pset_userblock(fctmpl, 512) != SUCCEED) {
- pass = FALSE;
- failure_mssg = "H5Pset_userblock(,size) failed.\n";
- }
- }
+ /* Initialize a file creation template */
+ if (pass) {
+ if ((fctmpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
+ pass = FALSE;
+ failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n";
+ }
+ else if (H5Pset_userblock(fctmpl, 512) != SUCCEED) {
+ pass = FALSE;
+ failure_mssg = "H5Pset_userblock(,size) failed.\n";
+ }
+ }
/* setup FAPL */
if ( pass ) {
if ( (fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0 ) {
@@ -347,7 +347,7 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
bytes_to_write = HDstrlen(text_to_write);
if (pass) {
- if ((header = HDopen(data_filename, O_WRONLY)) < 0) {
+ if ((header = HDopen(data_filename, O_WRONLY)) < 0) {
pass = FALSE;
failure_mssg = "HDopen(data_filename, O_WRONLY) failed.\n";
}
@@ -358,7 +358,7 @@ generate_test_file( MPI_Comm comm, int mpi_rank, int group_id )
if (HDwrite(header, text_to_write, bytes_to_write) < 0) {
pass = FALSE;
failure_mssg = "Unable to write user text into file.\n";
- }
+ }
}
if (pass || (header > 0)) {