summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2023-09-08 23:06:23 (GMT)
committerGitHub <noreply@github.com>2023-09-08 23:06:23 (GMT)
commit117d579c326f64d09d71e28cb0135bbd16a5232e (patch)
tree384ac7e1e3b9881e6d6ab783ee0391ab7adc1f29 /testpar
parent2345f901b26277f643dd91a528e4da975f4e75c1 (diff)
downloadhdf5-117d579c326f64d09d71e28cb0135bbd16a5232e.zip
hdf5-117d579c326f64d09d71e28cb0135bbd16a5232e.tar.gz
hdf5-117d579c326f64d09d71e28cb0135bbd16a5232e.tar.bz2
Consistent initialization of hid_t in the tests (#3521)
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_2Gio.c38
-rw-r--r--testpar/t_bigio.c10
-rw-r--r--testpar/t_cache.c16
-rw-r--r--testpar/t_cache_image.c50
-rw-r--r--testpar/t_dset.c36
-rw-r--r--testpar/t_file.c2
-rw-r--r--testpar/t_file_image.c8
-rw-r--r--testpar/t_mdset.c12
-rw-r--r--testpar/t_pmulti_dset.c6
-rw-r--r--testpar/t_pread.c30
-rw-r--r--testpar/t_shapesame.c74
-rw-r--r--testpar/t_vfd.c80
-rw-r--r--testpar/testphdf5.c2
13 files changed, 182 insertions, 182 deletions
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index e7e0cfe..91859ac 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -245,7 +245,7 @@ parse_options(int argc, char **argv)
hid_t
create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
{
- hid_t ret_pl = -1;
+ hid_t ret_pl = H5I_INVALID_HID;
herr_t ret; /* generic return value */
int mpi_rank; /* mpi variables */
@@ -3355,16 +3355,16 @@ test_actual_io_mode(int selection_mode)
int i;
MPI_Comm mpi_comm = MPI_COMM_NULL;
MPI_Info mpi_info = MPI_INFO_NULL;
- hid_t fid = -1;
- hid_t sid = -1;
- hid_t dataset = -1;
+ hid_t fid = H5I_INVALID_HID;
+ hid_t sid = H5I_INVALID_HID;
+ hid_t dataset = H5I_INVALID_HID;
hid_t data_type = H5T_NATIVE_INT;
- hid_t fapl_id = -1;
- hid_t mem_space = -1;
- hid_t file_space = -1;
- hid_t dcpl = -1;
- hid_t dxpl_write = -1;
- hid_t dxpl_read = -1;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t mem_space = H5I_INVALID_HID;
+ hid_t file_space = H5I_INVALID_HID;
+ hid_t dcpl = H5I_INVALID_HID;
+ hid_t dxpl_write = H5I_INVALID_HID;
+ hid_t dxpl_read = H5I_INVALID_HID;
hsize_t dims[MAX_RANK];
hsize_t chunk_dims[MAX_RANK];
hsize_t start[MAX_RANK];
@@ -3867,17 +3867,17 @@ test_no_collective_cause_mode(int selection_mode)
int i;
MPI_Comm mpi_comm;
MPI_Info mpi_info;
- hid_t fid = -1;
- hid_t sid = -1;
- hid_t dataset = -1;
+ hid_t fid = H5I_INVALID_HID;
+ hid_t sid = H5I_INVALID_HID;
+ hid_t dataset = H5I_INVALID_HID;
hid_t data_type = H5T_NATIVE_INT;
- hid_t fapl_id = -1;
- hid_t dcpl = -1;
- hid_t dxpl_write = -1;
- hid_t dxpl_read = -1;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t dcpl = H5I_INVALID_HID;
+ hid_t dxpl_write = H5I_INVALID_HID;
+ hid_t dxpl_read = H5I_INVALID_HID;
hsize_t dims[MAX_RANK];
- hid_t mem_space = -1;
- hid_t file_space = -1;
+ hid_t mem_space = H5I_INVALID_HID;
+ hid_t file_space = H5I_INVALID_HID;
hsize_t chunk_dims[MAX_RANK];
herr_t ret;
/* set to global value as default */
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c
index 24721b5..2726f91 100644
--- a/testpar/t_bigio.c
+++ b/testpar/t_bigio.c
@@ -1107,10 +1107,10 @@ single_rank_independent_io(void)
if (MAIN_PROCESS) {
hsize_t dims[1];
- hid_t file_id = -1;
- hid_t fapl_id = -1;
- hid_t dset_id = -1;
- hid_t fspace_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t fspace_id = H5I_INVALID_HID;
herr_t ret;
int *data = NULL;
uint64_t i;
@@ -1181,7 +1181,7 @@ single_rank_independent_io(void)
hid_t
create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
{
- hid_t ret_pl = -1;
+ hid_t ret_pl = H5I_INVALID_HID;
herr_t ret; /* generic return value */
int mpi_rank; /* mpi variables */
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 3659b2b..6a49354 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -3585,7 +3585,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
{
bool success = false; /* will set to true if appropriate. */
bool enable_rpt_fcn = false;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5AC_cache_config_t config;
H5AC_cache_config_t test_config;
H5F_t *file_ptr = NULL;
@@ -4902,7 +4902,7 @@ smoke_check_1(int metadata_write_strategy)
bool success = true;
int i;
int max_nerrors;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
struct mssg_t mssg;
@@ -5064,7 +5064,7 @@ smoke_check_2(int metadata_write_strategy)
bool success = true;
int i;
int max_nerrors;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
struct mssg_t mssg;
@@ -5267,7 +5267,7 @@ smoke_check_3(int metadata_write_strategy)
int max_count;
int min_idx;
int max_idx;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
struct mssg_t mssg;
@@ -5550,7 +5550,7 @@ smoke_check_4(int metadata_write_strategy)
int max_count;
int min_idx;
int max_idx;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
struct mssg_t mssg;
@@ -5823,7 +5823,7 @@ smoke_check_5(int metadata_write_strategy)
bool success = true;
int i;
int max_nerrors;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
struct mssg_t mssg;
@@ -6095,7 +6095,7 @@ trace_file_check(int metadata_write_strategy)
int max_nerrors;
size_t expected_line_len;
size_t actual_line_len;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
FILE *trace_file_ptr = NULL;
@@ -6411,7 +6411,7 @@ smoke_check_6(int metadata_write_strategy)
bool success = true;
int i;
int max_nerrors;
- hid_t fid = -1;
+ hid_t fid = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
struct mssg_t mssg;
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index d103cf7..7e14454 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -129,7 +129,7 @@ construct_test_file(int test_file_index)
const char *fcn_name = "construct_test_file()";
char filename[512];
bool show_progress = false;
- hid_t file_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
int cp = 0;
@@ -393,11 +393,11 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
int i, j, k, l, m;
int data_chunk[CHUNK_SIZE][CHUNK_SIZE];
herr_t status;
- hid_t dataspace_id = -1;
+ hid_t dataspace_id = H5I_INVALID_HID;
hid_t filespace_ids[MAX_NUM_DSETS];
- hid_t memspace_id = -1;
+ hid_t memspace_id = H5I_INVALID_HID;
hid_t dataset_ids[MAX_NUM_DSETS];
- hid_t properties = -1;
+ hid_t properties = H5I_INVALID_HID;
hsize_t dims[2];
hsize_t a_size[2];
hsize_t offset[2];
@@ -807,9 +807,9 @@ open_hdf5_file(const bool create_file, const bool mdci_sbem_expected, const bool
bool show_progress = false;
bool verbose = false;
int cp = 0;
- hid_t fapl_id = -1;
- hid_t fcpl_id = -1;
- hid_t file_id = -1;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t fcpl_id = H5I_INVALID_HID;
+ hid_t file_id = H5I_INVALID_HID;
herr_t result;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
@@ -1277,12 +1277,12 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
hsize_t offset[3];
hsize_t chunk_size[3];
hid_t status;
- hid_t dataspace_id = -1;
- hid_t memspace_id = -1;
- hid_t dset_id = -1;
- hid_t filespace_id = -1;
- hid_t dcpl_id = -1;
- hid_t dxpl_id = -1;
+ hid_t dataspace_id = H5I_INVALID_HID;
+ hid_t memspace_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t filespace_id = H5I_INVALID_HID;
+ hid_t dcpl_id = H5I_INVALID_HID;
+ hid_t dxpl_id = H5I_INVALID_HID;
show_progress = (show_progress && (mpi_rank == 0));
verbose = (verbose && (mpi_rank == 0));
@@ -1764,10 +1764,10 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
hsize_t a_size[3];
hsize_t offset[3];
hid_t status;
- hid_t memspace_id = -1;
- hid_t dset_id = -1;
- hid_t filespace_id = -1;
- hid_t dxpl_id = -1;
+ hid_t memspace_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t filespace_id = H5I_INVALID_HID;
+ hid_t dxpl_id = H5I_INVALID_HID;
show_progress = (show_progress && (mpi_rank == 0));
verbose = (verbose && (mpi_rank == 0));
@@ -2009,7 +2009,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size)
int cp = 0;
int i;
int num_dsets = PAR_NUM_DSETS;
- hid_t file_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
MPI_Comm dummy_comm = MPI_COMM_WORLD;
@@ -2122,9 +2122,9 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
hsize_t a_size[3];
hsize_t offset[3];
hid_t status;
- hid_t memspace_id = -1;
- hid_t dset_id = -1;
- hid_t filespace_id = -1;
+ hid_t memspace_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t filespace_id = H5I_INVALID_HID;
HDsnprintf(dset_name, sizeof(dset_name), "/dset%03d", dset_num);
@@ -2344,7 +2344,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
int data_chunk[CHUNK_SIZE][CHUNK_SIZE];
herr_t status;
hid_t filespace_ids[MAX_NUM_DSETS];
- hid_t memspace_id = -1;
+ hid_t memspace_id = H5I_INVALID_HID;
hid_t dataset_ids[MAX_NUM_DSETS];
hsize_t dims[2];
hsize_t a_size[2];
@@ -2591,7 +2591,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
const char *fcn_name = "verify_cache_image_RO()";
char filename[512];
bool show_progress = false;
- hid_t file_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
int cp = 0;
@@ -2851,7 +2851,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
const char *fcn_name = "verify_cache_imageRW()";
char filename[512];
bool show_progress = false;
- hid_t file_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
int cp = 0;
@@ -3113,7 +3113,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
const char *fcn_name = "smoke_check_1()";
char filename[512];
bool show_progress = false;
- hid_t file_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
int cp = 0;
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 789d9a0..51b8a7a 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -2913,16 +2913,16 @@ test_actual_io_mode(int selection_mode)
int i;
MPI_Comm mpi_comm = MPI_COMM_NULL;
MPI_Info mpi_info = MPI_INFO_NULL;
- hid_t fid = -1;
- hid_t sid = -1;
- hid_t dataset = -1;
+ hid_t fid = H5I_INVALID_HID;
+ hid_t sid = H5I_INVALID_HID;
+ hid_t dataset = H5I_INVALID_HID;
hid_t data_type = H5T_NATIVE_INT;
- hid_t fapl = -1;
- hid_t mem_space = -1;
- hid_t file_space = -1;
- hid_t dcpl = -1;
- hid_t dxpl_write = -1;
- hid_t dxpl_read = -1;
+ hid_t fapl = H5I_INVALID_HID;
+ hid_t mem_space = H5I_INVALID_HID;
+ hid_t file_space = H5I_INVALID_HID;
+ hid_t dcpl = H5I_INVALID_HID;
+ hid_t dxpl_write = H5I_INVALID_HID;
+ hid_t dxpl_read = H5I_INVALID_HID;
hsize_t dims[RANK];
hsize_t chunk_dims[RANK];
hsize_t start[RANK];
@@ -3453,17 +3453,17 @@ test_no_collective_cause_mode(int selection_mode)
int i;
MPI_Comm mpi_comm;
MPI_Info mpi_info;
- hid_t fid = -1;
- hid_t sid = -1;
- hid_t dataset = -1;
+ hid_t fid = H5I_INVALID_HID;
+ hid_t sid = H5I_INVALID_HID;
+ hid_t dataset = H5I_INVALID_HID;
hid_t data_type = H5T_NATIVE_INT;
- hid_t fapl = -1;
- hid_t dcpl = -1;
- hid_t dxpl_write = -1;
- hid_t dxpl_read = -1;
+ hid_t fapl = H5I_INVALID_HID;
+ hid_t dcpl = H5I_INVALID_HID;
+ hid_t dxpl_write = H5I_INVALID_HID;
+ hid_t dxpl_read = H5I_INVALID_HID;
hsize_t dims[RANK];
- hid_t mem_space = -1;
- hid_t file_space = -1;
+ hid_t mem_space = H5I_INVALID_HID;
+ hid_t file_space = H5I_INVALID_HID;
hsize_t chunk_dims[RANK];
herr_t ret;
/* set to global value as default */
diff --git a/testpar/t_file.c b/testpar/t_file.c
index 67e6999..89cca67 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -120,7 +120,7 @@ test_split_comm_access(void)
void
test_page_buffer_access(void)
{
- hid_t file_id = -1; /* File ID */
+ hid_t file_id = H5I_INVALID_HID; /* File ID */
hid_t fcpl, fapl;
size_t page_count = 0;
int i, num_elements = 200;
diff --git a/testpar/t_file_image.c b/testpar/t_file_image.c
index a4d5d39..7be03f6 100644
--- a/testpar/t_file_image.c
+++ b/testpar/t_file_image.c
@@ -67,11 +67,11 @@ file_image_daisy_chain_test(void)
int space_ndims;
MPI_Status rcvstat;
int *vector_ptr = NULL;
- hid_t fapl_id = -1;
+ hid_t fapl_id = H5I_INVALID_HID;
hid_t file_id; /* file IDs */
- hid_t dset_id = -1;
- hid_t dset_type_id = -1;
- hid_t space_id = -1;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t dset_type_id = H5I_INVALID_HID;
+ hid_t space_id = H5I_INVALID_HID;
herr_t err;
hsize_t dims[1];
void *image_ptr = NULL;
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index eabd762..9f21817 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -1806,9 +1806,9 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
{
int i;
int j;
- hid_t file_id = -1;
- hid_t fapl_id = -1;
- hid_t dxpl_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t dxpl_id = H5I_INVALID_HID;
hid_t att_id[NUM_DATA_SETS];
hid_t att_space[NUM_DATA_SETS];
hid_t lg_att_id[NUM_DATA_SETS];
@@ -2187,9 +2187,9 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
{
int i;
int j;
- hid_t file_id = -1;
- hid_t fapl_id = -1;
- hid_t dxpl_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t dxpl_id = H5I_INVALID_HID;
hid_t lg_att_id[NUM_DATA_SETS];
hid_t lg_att_type[NUM_DATA_SETS];
hid_t disk_space[NUM_DATA_SETS];
diff --git a/testpar/t_pmulti_dset.c b/testpar/t_pmulti_dset.c
index 3740f77..4d8bc77 100644
--- a/testpar/t_pmulti_dset.c
+++ b/testpar/t_pmulti_dset.c
@@ -102,10 +102,10 @@ test_pmdset(size_t niter, unsigned flags)
size_t max_dsets;
size_t buf_size;
size_t ndsets;
- hid_t file_id = -1;
- hid_t fapl_id = -1;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t fapl_id = H5I_INVALID_HID;
hid_t dcpl_id[MAX_DSETS];
- hid_t dxpl_id = -1;
+ hid_t dxpl_id = H5I_INVALID_HID;
hsize_t dset_dims[MAX_DSETS][3];
hsize_t chunk_dims[2];
hsize_t max_dims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
diff --git a/testpar/t_pread.c b/testpar/t_pread.c
index 5fefcf3..5a7176a 100644
--- a/testpar/t_pread.c
+++ b/testpar/t_pread.c
@@ -92,14 +92,14 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
hsize_t i;
hsize_t offset;
hsize_t dims[1] = {0};
- hid_t file_id = -1;
- hid_t memspace = -1;
- hid_t filespace = -1;
- hid_t fctmpl = -1;
- hid_t fapl_id = -1;
- hid_t dxpl_id = -1;
- hid_t dset_id = -1;
- hid_t dset_id_ch = -1;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t memspace = H5I_INVALID_HID;
+ hid_t filespace = H5I_INVALID_HID;
+ hid_t fctmpl = H5I_INVALID_HID;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t dxpl_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t dset_id_ch = H5I_INVALID_HID;
hid_t dcpl_id = H5P_DEFAULT;
hsize_t chunk[1];
float nextValue;
@@ -486,14 +486,14 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
int global_failures = 0;
int group_size;
int group_rank;
- hid_t fapl_id = -1;
- hid_t file_id = -1;
- hid_t dset_id = -1;
- hid_t dset_id_ch = -1;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t dset_id_ch = H5I_INVALID_HID;
hid_t dxpl_id = H5P_DEFAULT;
- hid_t memspace = -1;
- hid_t filespace = -1;
- hid_t filetype = -1;
+ hid_t memspace = H5I_INVALID_HID;
+ hid_t filespace = H5I_INVALID_HID;
+ hid_t filetype = H5I_INVALID_HID;
size_t filetype_size;
hssize_t dset_size;
hsize_t i;
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 2882c36..56e2396 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -1701,7 +1701,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
/* int chunk_edge_size = */ -1,
/* int small_rank = */ -1,
/* int large_rank = */ -1,
- /* hid_t dset_type = */ -1,
+ /* hid_t dset_type = */ H5I_INVALID_HID,
/* uint32_t * small_ds_buf_0 = */ NULL,
/* uint32_t * small_ds_buf_1 = */ NULL,
/* uint32_t * small_ds_buf_2 = */ NULL,
@@ -1712,24 +1712,24 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
/* uint32_t * large_ds_slice_buf = */ NULL,
/* int small_ds_offset = */ -1,
/* int large_ds_offset = */ -1,
- /* hid_t fid = */ -1, /* HDF5 file ID */
+ /* hid_t fid = */ H5I_INVALID_HID, /* HDF5 file ID */
/* hid_t xfer_plist = */ H5P_DEFAULT,
- /* hid_t full_mem_small_ds_sid = */ -1,
- /* hid_t full_file_small_ds_sid = */ -1,
- /* hid_t mem_small_ds_sid = */ -1,
- /* hid_t file_small_ds_sid_0 = */ -1,
- /* hid_t file_small_ds_sid_1 = */ -1,
- /* hid_t small_ds_slice_sid = */ -1,
- /* hid_t full_mem_large_ds_sid = */ -1,
- /* hid_t full_file_large_ds_sid = */ -1,
- /* hid_t mem_large_ds_sid = */ -1,
- /* hid_t file_large_ds_sid_0 = */ -1,
- /* hid_t file_large_ds_sid_1 = */ -1,
- /* hid_t file_large_ds_process_slice_sid = */ -1,
- /* hid_t mem_large_ds_process_slice_sid = */ -1,
- /* hid_t large_ds_slice_sid = */ -1,
- /* hid_t small_dataset = */ -1, /* Dataset ID */
- /* hid_t large_dataset = */ -1, /* Dataset ID */
+ /* hid_t full_mem_small_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t full_file_small_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t mem_small_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t file_small_ds_sid_0 = */ H5I_INVALID_HID,
+ /* hid_t file_small_ds_sid_1 = */ H5I_INVALID_HID,
+ /* hid_t small_ds_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t full_mem_large_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t full_file_large_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t mem_large_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t file_large_ds_sid_0 = */ H5I_INVALID_HID,
+ /* hid_t file_large_ds_sid_1 = */ H5I_INVALID_HID,
+ /* hid_t file_large_ds_process_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t mem_large_ds_process_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t large_ds_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t small_dataset = */ H5I_INVALID_HID, /* Dataset ID */
+ /* hid_t large_dataset = */ H5I_INVALID_HID, /* Dataset ID */
/* size_t small_ds_size = */ 1,
/* size_t small_ds_slice_size = */ 1,
/* size_t large_ds_size = */ 1,
@@ -3626,7 +3626,7 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
/* int chunk_edge_size = */ -1,
/* int small_rank = */ -1,
/* int large_rank = */ -1,
- /* hid_t dset_type = */ -1,
+ /* hid_t dset_type = */ H5I_INVALID_HID,
/* uint32_t * small_ds_buf_0 = */ NULL,
/* uint32_t * small_ds_buf_1 = */ NULL,
/* uint32_t * small_ds_buf_2 = */ NULL,
@@ -3637,24 +3637,24 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
/* uint32_t * large_ds_slice_buf = */ NULL,
/* int small_ds_offset = */ -1,
/* int large_ds_offset = */ -1,
- /* hid_t fid = */ -1, /* HDF5 file ID */
+ /* hid_t fid = */ H5I_INVALID_HID, /* HDF5 file ID */
/* hid_t xfer_plist = */ H5P_DEFAULT,
- /* hid_t full_mem_small_ds_sid = */ -1,
- /* hid_t full_file_small_ds_sid = */ -1,
- /* hid_t mem_small_ds_sid = */ -1,
- /* hid_t file_small_ds_sid_0 = */ -1,
- /* hid_t file_small_ds_sid_1 = */ -1,
- /* hid_t small_ds_slice_sid = */ -1,
- /* hid_t full_mem_large_ds_sid = */ -1,
- /* hid_t full_file_large_ds_sid = */ -1,
- /* hid_t mem_large_ds_sid = */ -1,
- /* hid_t file_large_ds_sid_0 = */ -1,
- /* hid_t file_large_ds_sid_1 = */ -1,
- /* hid_t file_large_ds_process_slice_sid = */ -1,
- /* hid_t mem_large_ds_process_slice_sid = */ -1,
- /* hid_t large_ds_slice_sid = */ -1,
- /* hid_t small_dataset = */ -1, /* Dataset ID */
- /* hid_t large_dataset = */ -1, /* Dataset ID */
+ /* hid_t full_mem_small_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t full_file_small_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t mem_small_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t file_small_ds_sid_0 = */ H5I_INVALID_HID,
+ /* hid_t file_small_ds_sid_1 = */ H5I_INVALID_HID,
+ /* hid_t small_ds_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t full_mem_large_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t full_file_large_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t mem_large_ds_sid = */ H5I_INVALID_HID,
+ /* hid_t file_large_ds_sid_0 = */ H5I_INVALID_HID,
+ /* hid_t file_large_ds_sid_1 = */ H5I_INVALID_HID,
+ /* hid_t file_large_ds_process_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t mem_large_ds_process_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t large_ds_slice_sid = */ H5I_INVALID_HID,
+ /* hid_t small_dataset = */ H5I_INVALID_HID, /* Dataset ID */
+ /* hid_t large_dataset = */ H5I_INVALID_HID, /* Dataset ID */
/* size_t small_ds_size = */ 1,
/* size_t small_ds_slice_size = */ 1,
/* size_t large_ds_size = */ 1,
@@ -4142,7 +4142,7 @@ parse_options(int argc, char **argv)
hid_t
create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
{
- hid_t ret_pl = -1;
+ hid_t ret_pl = H5I_INVALID_HID;
herr_t ret; /* generic return value */
int mpi_rank; /* mpi variables */
diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c
index d1950a9..cf6c4c9 100644
--- a/testpar/t_vfd.c
+++ b/testpar/t_vfd.c
@@ -349,10 +349,10 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
char filename[512];
int cp = 0;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- unsigned flags = 0; /* file open flags */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ unsigned flags = 0; /* file open flags */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
assert(vfd_name);
assert(lf_ptr);
@@ -732,9 +732,9 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
char filename[512];
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
uint32_t count;
@@ -962,9 +962,9 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
char filename[512];
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
uint32_t count;
@@ -1263,9 +1263,9 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
int32_t buf_3[(INTS_PER_RANK / 4) + 1];
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
uint32_t count;
@@ -1613,9 +1613,9 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
haddr_t eoa;
haddr_t base_addr;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int j;
@@ -2041,9 +2041,9 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
haddr_t eoa;
haddr_t base_addr;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int j;
@@ -2279,9 +2279,9 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
char filename[512];
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
uint32_t count;
@@ -2465,9 +2465,9 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
char filename[512];
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int j;
@@ -2718,9 +2718,9 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
size_t bytes_per_write;
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int j;
@@ -2978,9 +2978,9 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
size_t bytes_per_write;
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int j;
@@ -3274,9 +3274,9 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
int base_index;
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int j;
@@ -3709,9 +3709,9 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
haddr_t eoa;
haddr_t base_addr;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int base_index;
@@ -3965,9 +3965,9 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
int base_index;
haddr_t eoa;
bool show_progress = false;
- hid_t fapl_id = -1; /* file access property list ID */
- hid_t dxpl_id = -1; /* data access property list ID */
- H5FD_t *lf = NULL; /* VFD struct ptr */
+ hid_t fapl_id = H5I_INVALID_HID; /* file access property list ID */
+ hid_t dxpl_id = H5I_INVALID_HID; /* data access property list ID */
+ H5FD_t *lf = NULL; /* VFD struct ptr */
int cp = 0;
int i;
int j;
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index fcdf8fe..584ca1f 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -250,7 +250,7 @@ parse_options(int argc, char **argv)
hid_t
create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
{
- hid_t ret_pl = -1;
+ hid_t ret_pl = H5I_INVALID_HID;
herr_t ret; /* generic return value */
int mpi_rank; /* mpi variables */
generated by cgit v0.12 at 2024-06-28 21:30:16 (GMT)