diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-07-29 13:36:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 13:36:40 (GMT) |
| commit | 40fc2cca16cd562954d3b724fa56badb3b9da72b (patch) | |
| tree | 536b4bb51328af98ead7dfa1951f36b47f9b752a /test | |
| parent | c63dfb0fd3345ecb33014612f94d3959f147be03 (diff) | |
| download | hdf5-40fc2cca16cd562954d3b724fa56badb3b9da72b.zip hdf5-40fc2cca16cd562954d3b724fa56badb3b9da72b.tar.gz hdf5-40fc2cca16cd562954d3b724fa56badb3b9da72b.tar.bz2 | |
1.10 clang 13 format #1933 (#1940)
* clang 13 format #1933
* Correct workflow
Diffstat (limited to 'test')
103 files changed, 1272 insertions, 1270 deletions
diff --git a/test/accum.c b/test/accum.c index 45cabf7..f098021 100644 --- a/test/accum.c +++ b/test/accum.c @@ -89,7 +89,7 @@ main(void) unsigned nerrors = 0; /* track errors */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ hid_t fid = -1; - H5F_t * f = NULL; /* File for all tests */ + H5F_t *f = NULL; /* File for all tests */ /* Test Setup */ HDputs("Testing the metadata accumulator"); @@ -1934,8 +1934,8 @@ test_random_write(H5F_t *f) { uint8_t *wbuf, *rbuf; /* Buffers for reading & writing */ unsigned seed = 0; /* Random # seed */ - size_t * off; /* Offset of buffer segments to write */ - size_t * len; /* Size of buffer segments to write */ + size_t *off; /* Offset of buffer segments to write */ + size_t *len; /* Size of buffer segments to write */ size_t cur_off; /* Current offset */ size_t nsegments; /* Number of segments to write */ size_t swap; /* Position to swap with */ @@ -2088,12 +2088,12 @@ test_swmr_write_big(hbool_t newest_format) hid_t fid = -1; /* File ID */ hid_t fapl = -1; /* File access property list */ - H5F_t * rf = NULL; /* File pointer */ + H5F_t *rf = NULL; /* File pointer */ uint8_t *wbuf2 = NULL, *rbuf = NULL; /* Buffers for reading & writing */ uint8_t wbuf[1024]; /* Buffer for reading & writing */ unsigned u; /* Local index variable */ hbool_t process_success = FALSE; - char * driver = NULL; /* VFD string (from env variable) */ + char *driver = NULL; /* VFD string (from env variable) */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ if (newest_format) diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index 5d6f2ac..5d78f1c 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -44,11 +44,11 @@ main(void) { hid_t fid = -1; /* File ID */ hid_t fapl = -1; /* file access property list ID */ - H5F_t * f = NULL; /* File pointer */ + H5F_t *f = NULL; /* File pointer */ unsigned u; /* Local index variable */ uint8_t rbuf[1024]; /* Buffer for reading */ uint8_t buf[1024]; /* Buffer for holding the expected data */ - char * driver = NULL; /* VFD string (from env variable) */ + char *driver = NULL; /* VFD string (from env variable) */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ /* Skip this test if SWMR I/O is not supported for the VFD specified @@ -347,9 +347,9 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n) hsize_t hs_start[1]; hsize_t hs_size[1]; hid_t file = -1, space1 = -1, space2 = -1, mem_space = -1, d1 = -1, d2 = -1; - int * buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); + int *buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); int i, j; - FILE * out = HDfopen(DNAME, "w"); + FILE *out = HDfopen(DNAME, "w"); hid_t dcpl; switch (testsize) { @@ -493,12 +493,12 @@ error: static int reader(char *filename, hid_t fapl) { - FILE * script = NULL; + FILE *script = NULL; hid_t file = -1, mspace = -1, fspace = -1, d2 = -1; char ln[128], *s; hsize_t hs_offset[1]; hsize_t hs_size[1] = {WRT_SIZE}; - int * buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); + int *buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); int i, j, zero, wrong, nerrors = 0; /* Open script file */ diff --git a/test/btree2.c b/test/btree2.c index ffb73de..ee43f5f 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -342,7 +342,7 @@ static int iter_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * idx = (hsize_t *)_op_data; + hsize_t *idx = (hsize_t *)_op_data; if (*record != *idx) return (H5_ITER_ERROR); @@ -368,7 +368,7 @@ static int iter_rec_cb(const void *_record, void *_op_data) { const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record; - H5B2_test_rec_t * idx = (H5B2_test_rec_t *)_op_data; + H5B2_test_rec_t *idx = (H5B2_test_rec_t *)_op_data; if (record->key != idx->key) return (H5_ITER_ERROR); @@ -397,7 +397,7 @@ static int find_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * search = (hsize_t *)_op_data; + hsize_t *search = (hsize_t *)_op_data; if (*record != *search) return (FALSE); @@ -422,7 +422,7 @@ static int find_rec_cb(const void *_record, void *_op_data) { const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record; - H5B2_test_rec_t * search = (H5B2_test_rec_t *)_op_data; + H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data; if (record->key != search->key) return (FALSE); @@ -450,7 +450,7 @@ static int find_dec_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * search = (hsize_t *)_op_data; + hsize_t *search = (hsize_t *)_op_data; if (*record != (INSERT_MANY - (*search + 1))) return (-1); @@ -475,7 +475,7 @@ static int index_rec_cb(const void *_record, void *_op_data) { const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record; - H5B2_test_rec_t * search = (H5B2_test_rec_t *)_op_data; + H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data; HDassert(record); HDassert(search); @@ -503,7 +503,7 @@ static int neighbor_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * search = (hsize_t *)_op_data; + hsize_t *search = (hsize_t *)_op_data; *search = *record; @@ -602,7 +602,7 @@ static int remove_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * rrecord = (hsize_t *)_op_data; + hsize_t *rrecord = (hsize_t *)_op_data; *rrecord = *record; @@ -626,7 +626,7 @@ static unsigned test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ @@ -845,8 +845,8 @@ static unsigned test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t idx; /* Index within B-tree, for iterator */ @@ -1021,8 +1021,8 @@ static unsigned test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1174,8 +1174,8 @@ static unsigned test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1335,8 +1335,8 @@ static unsigned test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1477,8 +1477,8 @@ static unsigned test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1595,8 +1595,8 @@ static unsigned test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1777,8 +1777,8 @@ static unsigned test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2005,8 +2005,8 @@ static unsigned test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2239,8 +2239,8 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2410,8 +2410,8 @@ static unsigned test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2589,8 +2589,8 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2766,8 +2766,8 @@ static unsigned test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2945,13 +2945,13 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t { hid_t file = -1; /* File ID */ char filename[1024]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t idx; /* Index within B-tree, for iterator */ time_t curr_time; /* Current time, for seeding random number generator */ - hsize_t * records; /* Record #'s for random insertion */ + hsize_t *records; /* Record #'s for random insertion */ unsigned u; /* Local index variable */ unsigned swap_idx; /* Location to swap with when shuffling */ hsize_t temp_rec; /* Temporary record */ @@ -3180,8 +3180,8 @@ static unsigned test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t modify; /* Modified value */ @@ -3553,8 +3553,8 @@ static unsigned test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t modify; /* Modified value */ @@ -3805,8 +3805,8 @@ static unsigned test_update_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -3962,8 +3962,8 @@ static unsigned test_update_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -4127,8 +4127,8 @@ static unsigned test_update_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t idx; /* Index within B-tree, for iterator */ @@ -4273,8 +4273,8 @@ static unsigned test_update_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -4394,8 +4394,8 @@ static unsigned test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t find; /* Record to find */ @@ -4948,8 +4948,8 @@ static unsigned test_update_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ time_t curr_time; /* Current time, for seeding random number generator */ H5B2_test_rec_t *records; /* Record #'s for random insertion */ @@ -5193,7 +5193,7 @@ static unsigned test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ @@ -5506,8 +5506,8 @@ static unsigned test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5730,8 +5730,8 @@ static unsigned test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5926,8 +5926,8 @@ static unsigned test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6104,8 +6104,8 @@ static unsigned test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6229,8 +6229,8 @@ static unsigned test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6456,8 +6456,8 @@ test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6604,8 +6604,8 @@ test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6752,8 +6752,8 @@ test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6897,8 +6897,8 @@ test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -7041,8 +7041,8 @@ static unsigned test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -7179,8 +7179,8 @@ static unsigned test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -7465,8 +7465,8 @@ test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t * const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -7616,8 +7616,8 @@ test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t * const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -7767,8 +7767,8 @@ test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -7919,8 +7919,8 @@ test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -8071,8 +8071,8 @@ test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -8197,8 +8197,8 @@ test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -8322,8 +8322,8 @@ static unsigned test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -8448,8 +8448,8 @@ static unsigned test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -8574,8 +8574,8 @@ gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam, had const hsize_t *records) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ hsize_t record; /* Record to insert into tree */ unsigned u; /* Local index variable */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -8652,17 +8652,17 @@ test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cpara { hid_t file = -1; /* File ID */ char filename[1024]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ int fd = -1; /* File descriptor */ h5_stat_t sb; /* Stat buffer for file */ - void * file_data = NULL; /* Copy of file data */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + void *file_data = NULL; /* Copy of file data */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ haddr_t root_addr; /* Address of root of B-tree created */ time_t curr_time; /* Current time, for seeding random number generator */ - hsize_t * records; /* Record #'s for random insertion */ + hsize_t *records; /* Record #'s for random insertion */ unsigned u; /* Local index variable */ unsigned rem_idx; /* Location to remove */ hsize_t nrec; /* Number of records in B-tree */ @@ -9094,12 +9094,12 @@ static unsigned test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t search; /* Search value */ - hsize_t * records; /* Record #'s for random insertion */ + hsize_t *records; /* Record #'s for random insertion */ unsigned u; /* Local index variable */ H5B2_node_info_test_t ninfo; /* B-tree node info */ herr_t ret; /* Generic error return value */ @@ -9320,10 +9320,10 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam) { hid_t file = -1; /* File ID */ char filename[1024]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size; /* Size of an empty file */ h5_stat_size_t file_size; /* Size of each file created */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -9591,8 +9591,8 @@ static unsigned test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t modify; /* Modified value */ @@ -9832,8 +9832,8 @@ test_open_twice_diff(hid_t fapl, const H5B2_create_t *cparam) hid_t file2 = -1; /* File ID */ hid_t file0 = -1; /* File ID */ hid_t file00 = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5F_t * f2 = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5F_t *f2 = NULL; /* Internal file object pointer */ H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ H5B2_t *bt2_2 = NULL; /* Second v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ @@ -9971,7 +9971,7 @@ main(void) unsigned nerrors = 0; /* Cumulative error count */ unsigned reopen; /* Whether to reopen B-tree during tests */ int ExpressMode; - const char * envval = NULL; + const char *envval = NULL; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ envval = HDgetenv("HDF5_DRIVER"); diff --git a/test/cache.c b/test/cache.c index 5cd0a10..8ab5838 100644 --- a/test/cache.c +++ b/test/cache.c @@ -259,7 +259,7 @@ smoke_check_1(int express_test, unsigned paged) int32_t lag = 10; int32_t max_index = (10 * 1024) - 1; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #1P -- all clean, ins, dest, ren, 4/2 MB cache") @@ -457,7 +457,7 @@ smoke_check_2(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #2P -- ~1/2 dirty, ins, dest, ren, 4/2 MB cache") @@ -654,7 +654,7 @@ smoke_check_3(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #3P -- all clean, ins, dest, ren, 2/1 KB cache") @@ -852,7 +852,7 @@ smoke_check_4(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #4P -- ~1/2 dirty, ins, dest, ren, 2/1 KB cache") @@ -1049,8 +1049,8 @@ smoke_check_5(int express_test, unsigned paged) hbool_t display_stats = FALSE; int32_t max_index = 1024; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1281,8 +1281,8 @@ smoke_check_6(int express_test, unsigned paged) hbool_t display_stats = FALSE; int mile_stone = 1; int32_t max_index = 1024; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1513,8 +1513,8 @@ smoke_check_7(int express_test, unsigned paged) hbool_t display_stats = FALSE; int mile_stone = 1; int32_t max_index = 1024; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1746,8 +1746,8 @@ smoke_check_8(int express_test, unsigned paged) hbool_t display_stats = FALSE; int mile_stone = 1; int32_t max_index = 1024; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1989,8 +1989,8 @@ smoke_check_9(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; if (paged) TESTING("smoke check #9P -- all clean, ins, dest, ren, 4/2 MB, corked") @@ -2300,8 +2300,8 @@ smoke_check_10(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; if (paged) TESTING("smoke check #10P -- ~1/2 dirty, ins, dest, ren, 4/2 MB, corked") @@ -2606,7 +2606,7 @@ write_permitted_check(int int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ @@ -2818,10 +2818,10 @@ check_insert_entry(unsigned paged) hbool_t is_protected; hbool_t is_pinned; size_t entry_size; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - test_entry_t * base_addr; - test_entry_t * entry_ptr; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + test_entry_t *base_addr; + test_entry_t *entry_ptr; struct H5C_cache_entry_t *search_ptr; if (paged) @@ -4453,7 +4453,7 @@ static void check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags, unsigned int spec_size, struct flush_cache_test_spec spec[]) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; unsigned u; size_t total_entry_size = 0; @@ -4638,7 +4638,7 @@ static void check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags, unsigned int spec_size, struct pe_flush_cache_test_spec spec[]) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; unsigned u; int j; @@ -4832,8 +4832,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) const int max_num_spec = 10; const int max_num_check = 4; struct fo_flush_cache_test_spec *spec = NULL; - struct fo_flush_entry_check * checks = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + struct fo_flush_entry_check *checks = NULL; + H5C_t *cache_ptr = file_ptr->shared->cache; if (cache_ptr == NULL) { @@ -8206,7 +8206,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu unsigned expected_index_len, size_t expected_index_size, int check_size, struct fo_flush_entry_check check[]) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; int i; int j; @@ -8598,7 +8598,7 @@ static void check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; const int num_variable_entries = 10; const int num_monster_entries = 31; @@ -11050,7 +11050,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty hbool_t expected_deserialized, hbool_t expected_serialized, hbool_t expected_destroyed) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; test_entry_t *base_addr; test_entry_t *entry_ptr = NULL; @@ -11198,7 +11198,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e unsigned int flush_flags, hbool_t expected_serialized, hbool_t expected_destroyed) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; hbool_t expected_deserialized = TRUE; test_entry_t *base_addr; @@ -11362,7 +11362,7 @@ check_get_entry_status(unsigned paged) hbool_t is_protected; hbool_t is_pinned; size_t entry_size; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr = NULL; test_entry_t *entry_ptr = NULL; @@ -11583,7 +11583,7 @@ check_expunge_entry(unsigned paged) hbool_t is_protected; hbool_t is_pinned; size_t entry_size; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -12248,7 +12248,7 @@ static unsigned check_move_entry(unsigned paged) { unsigned u; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; struct move_entry_test_spec test_specs[4] = { {/* int entry_type = */ PICO_ENTRY_TYPE, /* int entry_index = */ 10, @@ -12349,11 +12349,11 @@ check_move_entry(unsigned paged) static void check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry_test_spec *spec_ptr) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; unsigned int flags = H5C__NO_FLAGS_SET; - test_entry_t * base_addr; - test_entry_t * entry_ptr = NULL; + test_entry_t *base_addr; + test_entry_t *entry_ptr = NULL; H5C_cache_entry_t *test_ptr = NULL; if (cache_ptr == NULL) { @@ -12505,7 +12505,7 @@ check_pin_protected_entry(unsigned paged) { static char msg[128]; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -12618,8 +12618,8 @@ check_resize_entry(unsigned paged) hbool_t is_pinned; size_t entry_size; size_t reported_entry_size; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr = NULL; @@ -13485,8 +13485,8 @@ check_evictions_enabled(unsigned paged) hbool_t in_cache; int i; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; test_entry_t *base_addr = NULL; test_entry_t *entry_ptr; @@ -14407,7 +14407,7 @@ static unsigned check_duplicate_insert_err(unsigned paged) { herr_t result = -1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -14491,7 +14491,7 @@ static unsigned check_double_pin_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14580,7 +14580,7 @@ static unsigned check_double_unpin_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14678,7 +14678,7 @@ static unsigned check_pin_entry_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14785,8 +14785,8 @@ check_pin_entry_errs(unsigned paged) static unsigned check_double_protect_err(unsigned paged) { - H5F_t * file_ptr = NULL; - test_entry_t * entry_ptr; + H5F_t *file_ptr = NULL; + test_entry_t *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (paged) @@ -14868,7 +14868,7 @@ static unsigned check_double_unprotect_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14949,7 +14949,7 @@ static unsigned check_mark_entry_dirty_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15032,7 +15032,7 @@ static unsigned check_expunge_entry_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15144,8 +15144,8 @@ static unsigned check_move_entry_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; test_entry_t *entry_ptr = NULL; test_entry_t *entry_0_0_ptr; test_entry_t *entry_0_1_ptr; @@ -15261,7 +15261,7 @@ static unsigned check_resize_entry_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15362,7 +15362,7 @@ static unsigned check_unprotect_ro_dirty_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15486,9 +15486,9 @@ check_unprotect_ro_dirty_err(unsigned paged) static unsigned check_protect_ro_rw_err(unsigned paged) { - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; - void * thing_ptr = NULL; + void *thing_ptr = NULL; if (paged) TESTING("protect a read only entry rw error (paged aggregation)") @@ -15567,10 +15567,10 @@ check_protect_ro_rw_err(unsigned paged) static unsigned check_protect_retries(unsigned paged) { - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - test_entry_t * base_addr = NULL; - test_entry_t * entry_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + test_entry_t *base_addr = NULL; + test_entry_t *entry_ptr = NULL; H5C_cache_entry_t *cache_entry_ptr = NULL; int32_t type; int32_t idx; @@ -15704,8 +15704,8 @@ check_check_evictions_enabled_err(unsigned paged) { herr_t result; hbool_t evictions_enabled; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; if (paged) TESTING("get/set evictions enabled errors (paged aggregation)") @@ -15857,8 +15857,8 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) herr_t result; int32_t i; int32_t checkpoint = 0; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -19712,8 +19712,8 @@ check_auto_cache_resize_disable(unsigned paged) herr_t result; int32_t i; int32_t checkpoint = 0; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -22311,8 +22311,8 @@ check_auto_cache_resize_epoch_markers(unsigned paged) int32_t i; int32_t j; int32_t checkpoint = 0; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -22999,8 +22999,8 @@ static unsigned check_auto_cache_resize_input_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t ref_auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -25232,8 +25232,8 @@ check_auto_cache_resize_aux_fcns(unsigned paged) { herr_t result; int32_t i; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; double hit_rate; size_t max_size; size_t min_clean_size; @@ -25735,8 +25735,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) struct expected_entry_status *expected = NULL; int entry_type = HUGE_ENTRY_TYPE; size_t entry_size = HUGE_ENTRY_SIZE; /* 16 KB */ - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; hbool_t show_progress = FALSE; int32_t checkpoint = 0; int32_t entry_idx = 0; @@ -26452,8 +26452,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) static unsigned check_flush_deps(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ - H5C_t * cache_ptr = NULL; /* Metadata cache for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ + H5C_t *cache_ptr = NULL; /* Metadata cache for this test */ test_entry_t *base_addr; /* Base address of entries for test */ int entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */ unsigned u; /* Local index variable */ @@ -28375,7 +28375,7 @@ done: static unsigned check_flush_deps_err(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ int entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */ unsigned test_count; /* Test iteration variable */ @@ -28650,8 +28650,8 @@ done: static unsigned check_flush_deps_order(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ - H5C_t * cache_ptr = NULL; /* Metadata cache for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ + H5C_t *cache_ptr = NULL; /* Metadata cache for this test */ int entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */ unsigned u; /* Local index variable */ unsigned flush_order; /* Index for tracking flush order */ @@ -31379,8 +31379,8 @@ done: static unsigned check_notify_cb(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ - H5C_t * cache_ptr = NULL; /* Metadata cache for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ + H5C_t *cache_ptr = NULL; /* Metadata cache for this test */ test_entry_t *base_addr; /* Base address of entries for test */ test_entry_t *entry_ptr; /* Cache entry to examine/manipulate */ int entry_type = NOTIFY_ENTRY_TYPE; /* Use entry w/notify callback (size of entries doesn't matter) */ @@ -31597,11 +31597,11 @@ static unsigned check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) { struct expected_entry_status *expected = NULL; - const char * fcn_name = "check_metadata_cork"; + const char *fcn_name = "check_metadata_cork"; int entry_type = HUGE_ENTRY_TYPE; size_t entry_size = HUGE_ENTRY_SIZE; /* 16 KB */ - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; hbool_t show_progress = FALSE; int32_t checkpoint = 0; int32_t entry_idx = 0; @@ -32305,7 +32305,7 @@ static void cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; expected = HDmalloc(36 * sizeof(struct expected_entry_status)); @@ -32545,7 +32545,7 @@ static void cedds__H5C_make_space_in_cache(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; const int num_huge_entries = 4; const int num_monster_entries = 32; @@ -32907,7 +32907,7 @@ static void cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; herr_t result; H5C_auto_size_ctl_t saved_auto_size_ctl; @@ -33366,12 +33366,12 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) static void cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; int expected_hash_bucket = 0; haddr_t entry_addr; - test_entry_t * entry_ptr; - test_entry_t * base_addr = NULL; + test_entry_t *entry_ptr; + test_entry_t *base_addr = NULL; struct H5C_cache_entry_t *scan_ptr; /* clang-format off */ struct expected_entry_status expected[5] = @@ -34178,9 +34178,9 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) hbool_t verbose = TRUE; int mile_stone = 1; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - H5F_t * ret_val = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + H5F_t *ret_val = NULL; haddr_t actual_base_addr; hid_t fapl_id = H5P_DEFAULT; hid_t fcpl_id = H5P_DEFAULT; diff --git a/test/cache_api.c b/test/cache_api.c index b803392..f1b49cb 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -69,8 +69,8 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) hid_t fapl_id = -1; hid_t test_fapl_id = -1; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t default_config = H5AC__DEFAULT_CACHE_CONFIG; H5AC_cache_config_t mod_config = { /* int version = */ H5AC__CURR_CACHE_CONFIG_VERSION, diff --git a/test/cache_common.c b/test/cache_common.c index 8c90ae4..3be633d 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -136,7 +136,7 @@ static void mark_flush_dep_clean(test_entry_t *entry_ptr); static herr_t get_initial_load_size(void *udata_ptr, size_t *image_len_ptr, int32_t entry_type); static herr_t get_final_load_size(const void *image, size_t image_len, void *udata, size_t *actual_len, int32_t entry_type); -static void * deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr, +static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr, int32_t entry_type); static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type); static herr_t pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, @@ -821,7 +821,7 @@ herr_t image_len(const void *thing, size_t *image_length, int32_t entry_type) { const test_entry_t *entry; - test_entry_t * base_addr; + test_entry_t *base_addr; int32_t type; int32_t idx; @@ -1826,8 +1826,8 @@ hbool_t entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx) { hbool_t in_cache = FALSE; /* will set to TRUE if necessary */ - test_entry_t * base_addr; - test_entry_t * entry_ptr; + test_entry_t *base_addr; + test_entry_t *entry_ptr; H5C_cache_entry_t *test_ptr = NULL; HDassert(cache_ptr); @@ -2820,7 +2820,7 @@ void cork_entry_type(H5F_t *file_ptr, int32_t type) { if (pass) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; haddr_t baddrs; cache_ptr = file_ptr->shared->cache; @@ -2855,7 +2855,7 @@ void uncork_entry_type(H5F_t *file_ptr, int32_t type) { if (pass) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; haddr_t baddrs; cache_ptr = file_ptr->shared->cache; @@ -2890,7 +2890,7 @@ uncork_entry_type(H5F_t *file_ptr, int32_t type) void insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; herr_t result; hbool_t insert_pinned; test_entry_t *base_addr; @@ -3143,9 +3143,9 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) void protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) { - H5C_t * cache_ptr; - test_entry_t * base_addr; - test_entry_t * entry_ptr; + H5C_t *cache_ptr; + test_entry_t *base_addr; + test_entry_t *entry_ptr; haddr_t baddrs; H5C_cache_entry_t *cache_entry_ptr; @@ -3243,9 +3243,9 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) void protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) { - H5C_t * cache_ptr; - test_entry_t * base_addr; - test_entry_t * entry_ptr; + H5C_t *cache_ptr; + test_entry_t *base_addr; + test_entry_t *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (pass) { @@ -3539,7 +3539,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t local_max_index; @@ -3869,7 +3869,7 @@ void hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t i; @@ -3963,7 +3963,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; int32_t idx; int32_t local_max_index; @@ -4221,7 +4221,7 @@ void hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; int32_t idx; int32_t i; @@ -4314,7 +4314,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t local_max_index[NUMBER_OF_ENTRY_TYPES]; @@ -4406,7 +4406,7 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t lag = 200; @@ -4509,7 +4509,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int mile_stone = 1; int32_t type; int32_t idx; @@ -4613,7 +4613,7 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx = -1; int32_t lag = 50; @@ -4974,8 +4974,8 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d int64_t cache_accesses = 0; double expected_hit_rate; double hit_rate; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; /* get a pointer to the files internal data structure */ if (pass) { @@ -5099,8 +5099,8 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c size_t cur_size; uint32_t expected_cur_num_entries; int cur_num_entries; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; /* get a pointer to the files internal data structure */ if (pass) { @@ -5258,8 +5258,8 @@ void validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t compare_init, int test_num) { static char msg[256]; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t scratch; H5C_auto_size_ctl_t int_config; diff --git a/test/cache_common.h b/test/cache_common.h index b8ca2e1..901f5c2 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -262,7 +262,7 @@ typedef struct test_entry_t { * sanity checking. */ test_entry_action_t action; /* Action being performed on a test entry */ - H5F_t * file_ptr; /* pointer to the file in which the + H5F_t *file_ptr; /* pointer to the file in which the * entry resides, or NULL if the entry * is not in a file. */ @@ -391,7 +391,7 @@ typedef struct test_entry_t { unsigned flush_dep_npar; /* Number of flush dependency parents */ unsigned flush_dep_nchd; /* Number of flush dependency children */ unsigned - flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including grandchildren, etc.) */ + flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including grandchildren, etc.) */ hbool_t pinned_from_client; /* entry was pinned by client call */ hbool_t pinned_from_cache; /* entry was pinned by cache internally */ unsigned flush_order; /* Order that entry was flushed in */ diff --git a/test/cache_image.c b/test/cache_image.c index dd6175a..f2f7b51 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -507,7 +507,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl hbool_t config_fsm, hbool_t set_eoc, const char *hdf_file_name, unsigned cache_image_flags, hid_t *file_id_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr) { - const char * fcn_name = "open_hdf5_file()"; + const char *fcn_name = "open_hdf5_file()"; hbool_t show_progress = FALSE; hbool_t verbose = FALSE; int cp = 0; @@ -515,8 +515,8 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl hid_t fcpl_id = -1; hid_t file_id = -1; herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_cache_image_ctl_t image_ctl; H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; @@ -870,7 +870,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl static void attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fapl, const char *hdf_file_name) { - const char * fcn_name = "attempt_swmr_open_hdf5_file()"; + const char *fcn_name = "attempt_swmr_open_hdf5_file()"; hbool_t show_progress = FALSE; int cp = 0; hid_t fapl_id = -1; @@ -1274,8 +1274,8 @@ check_cache_image_ctl_flow_1(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image control flow test 1"); @@ -1544,8 +1544,8 @@ check_cache_image_ctl_flow_2(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image control flow test 2"); @@ -1801,8 +1801,8 @@ check_cache_image_ctl_flow_3(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image control flow test 3"); @@ -2160,8 +2160,8 @@ check_cache_image_ctl_flow_4(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image control flow test 4"); @@ -2482,8 +2482,8 @@ check_cache_image_ctl_flow_5(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image control flow test 5"); @@ -2756,8 +2756,8 @@ check_cache_image_ctl_flow_6(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image control flow test 6"); @@ -3035,8 +3035,8 @@ cache_image_smoke_check_1(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image smoke check 1"); @@ -3439,8 +3439,8 @@ cache_image_smoke_check_2(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image smoke check 2"); @@ -3730,8 +3730,8 @@ cache_image_smoke_check_3(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image smoke check 3"); @@ -4100,8 +4100,8 @@ cache_image_smoke_check_4(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; int min_dset = 0; int max_dset = 0; @@ -4488,8 +4488,8 @@ cache_image_smoke_check_5(void) hbool_t show_progress = FALSE; hid_t file_id = -1; hid_t proc_gid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; int i; int min_group = 0; @@ -4973,12 +4973,12 @@ cache_image_smoke_check_5(void) static unsigned cache_image_smoke_check_6(void) { - const char * fcn_name = "cache_image_smoke_check_6()"; + const char *fcn_name = "cache_image_smoke_check_6()"; char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; h5_stat_size_t file_size; int cp = 0; int min_dset = 0; @@ -5365,8 +5365,8 @@ cache_image_api_error_check_1(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image api error check 1"); @@ -5726,8 +5726,8 @@ cache_image_api_error_check_2(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image api error check 2"); @@ -6120,8 +6120,8 @@ cache_image_api_error_check_3(void) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; TESTING("metadata cache image api error check 3"); @@ -6390,13 +6390,13 @@ cache_image_api_error_check_3(void) static unsigned cache_image_api_error_check_4(void) { - const char * fcn_name = "cache_image_api_error_check_4()"; + const char *fcn_name = "cache_image_api_error_check_4()"; char filename[512]; hbool_t show_progress = FALSE; hid_t fapl_id = -1; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; H5AC_cache_image_config_t cache_image_config; @@ -6955,12 +6955,12 @@ cache_image_api_error_check_4(void) static unsigned get_free_sections_test(void) { - const char * fcn_name = "get_free_sections_test()"; + const char *fcn_name = "get_free_sections_test()"; char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; h5_stat_size_t file_size; int cp = 0; @@ -7407,8 +7407,8 @@ evict_on_close_test(void) hbool_t show_progress = FALSE; hbool_t verbose = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; #endif /* H5_HAVE_PARALLEL */ diff --git a/test/cache_logging.c b/test/cache_logging.c index af43845..077ac91 100644 --- a/test/cache_logging.c +++ b/test/cache_logging.c @@ -37,7 +37,7 @@ test_logging_api(void) hbool_t is_enabled_out; hbool_t start_on_access; hbool_t start_on_access_out; - char * location = NULL; + char *location = NULL; size_t size; hid_t fid = -1; diff --git a/test/cache_tagging.c b/test/cache_tagging.c index 2dea1d4..8761ed5 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -1727,7 +1727,7 @@ check_attribute_rename_tags(hid_t fcpl, int type) #ifndef NDEBUG int verbose = FALSE; /* verbose file outout */ #endif /* NDEBUG */ /* end debugging functions */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ haddr_t root_tag = 0; haddr_t g_tag = 0; @@ -1943,7 +1943,7 @@ check_attribute_delete_tags(hid_t fcpl, int type) #ifndef NDEBUG int verbose = FALSE; /* verbose file outout */ #endif /* NDEBUG */ /* end debugging functions */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ haddr_t root_tag = 0; haddr_t g_tag = 0; @@ -2585,7 +2585,7 @@ check_dataset_write_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during dataset write"); @@ -2736,7 +2736,7 @@ check_attribute_write_tags(hid_t fcpl, int type) #ifndef NDEBUG int verbose = FALSE; /* verbose file outout */ #endif /* NDEBUG */ /* end debugging functions */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ haddr_t root_tag = 0; haddr_t g_tag = 0; @@ -2922,7 +2922,7 @@ check_dataset_read_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during dataset read"); @@ -3076,7 +3076,7 @@ check_dataset_size_retrieval(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t dsize = 0; /* Testing Macro */ @@ -3232,7 +3232,7 @@ check_dataset_extend_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t newdims[2] = {DIMS * 2, DIMS}; /* dimensions */ /* Testing Macro */ @@ -3653,7 +3653,7 @@ check_link_removal_tags(hid_t fcpl, int type) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during link removal"); @@ -3834,7 +3834,7 @@ check_link_getname_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during link name retrieval"); @@ -4264,7 +4264,7 @@ check_invalid_tag_application(void) { #if H5C_DO_TAGGING_SANITY_CHECKS /* Variables */ - H5F_t * f = NULL; + H5F_t *f = NULL; hid_t fid = -1; haddr_t addr; H5HL_t *lheap = NULL; diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 8777096..d918bcc 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -1713,7 +1713,7 @@ static unsigned test_pack_ooo(void) { hid_t cmpd, sub_cmpd; /* Datatype IDs */ - H5T_t * dt; /* Datatype pointer */ + H5T_t *dt; /* Datatype pointer */ unsigned order[PACK_NMEMBS]; /* Order of insertion */ unsigned free_order[PACK_NMEMBS]; /* Index of remaining free slots in order */ unsigned num_free; /* Number of free slots in order */ diff --git a/test/cmpd_dtransform.c b/test/cmpd_dtransform.c index f1af173..8d4c542 100644 --- a/test/cmpd_dtransform.c +++ b/test/cmpd_dtransform.c @@ -41,10 +41,10 @@ main(void) hid_t att_attr_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; const char *expr = "2*x"; - int * data = NULL; - int * data_res = NULL; - att_t * atts = NULL; - att_t * atts_res = NULL; + int *data = NULL; + int *data_res = NULL; + att_t *atts = NULL; + att_t *atts_res = NULL; /* Compound datatype */ if (NULL == (atts = HDmalloc(sizeof(att_t)))) diff --git a/test/cork.c b/test/cork.c index c427dbd..94f3bb0 100644 --- a/test/cork.c +++ b/test/cork.c @@ -97,8 +97,8 @@ verify_old_dset_cork(void) hsize_t dims[2] = {100, 20}; /* Dataset dimension sizes */ hsize_t max_dims[2] = {100, H5S_UNLIMITED}; /* Dataset maximum dimension sizes */ hsize_t chunk_dims[2] = {2, 5}; /* Dataset chunked dimension sizes */ - int ** buf = NULL; /* Data bufer (pointers to fake 2D array) */ - int * buf_data = NULL; /* Data buffer (actual data) */ + int **buf = NULL; /* Data bufer (pointers to fake 2D array) */ + int *buf_data = NULL; /* Data buffer (actual data) */ int i = 0, j = 0; /* Local index variables */ H5O_info_t oinfo, oinfo2, oinfo3; /* Object metadata information */ hsize_t dims2[2] = {8, 16}; /* Dataset dimension sizes */ @@ -509,8 +509,8 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) hsize_t dims[2] = {100, 20}; /* Dataset dimension sizes */ hsize_t max_dims[2] = {100, H5S_UNLIMITED}; /* Dataset maximum dimension sizes */ hsize_t chunk_dims[2] = {2, 5}; /* Dataset chunked dimension sizes */ - int ** buf = NULL; /* Data bufer (pointers to fake 2D array) */ - int * buf_data = NULL; /* Data buffer (actual data) */ + int **buf = NULL; /* Data bufer (pointers to fake 2D array) */ + int *buf_data = NULL; /* Data buffer (actual data) */ int i = 0, j = 0; /* Local index variables */ H5O_info_t oinfo, oinfo2, oinfo3; /* Object metadata information */ unsigned flags; /* File access flags */ @@ -1893,9 +1893,9 @@ test_dset_cork(hbool_t swmr, hbool_t new_format) hsize_t cdims[RANK] = {2, 2}; /* Chunk dimensions */ int fillval = 0; /* Fill value */ int i, j, k = 0; /* Local index variables */ - int ** wbuf = NULL; /* Data buffer for writes (pointers to fake 2D array) */ - int * wbuf_data = NULL; /* Data buffer for writes (real data) */ - int * rbuf_data = NULL; /* Data buffer for reads (real data) */ + int **wbuf = NULL; /* Data buffer for writes (pointers to fake 2D array) */ + int *wbuf_data = NULL; /* Data buffer for writes (real data) */ + int *rbuf_data = NULL; /* Data buffer for reads (real data) */ hbool_t corked; /* Cork status of an object */ unsigned flags; /* File access flags */ diff --git a/test/dangle.c b/test/dangle.c index d41507b..5bf7d8e 100644 --- a/test/dangle.c +++ b/test/dangle.c @@ -541,7 +541,7 @@ test_dangle_force(void) hid_t aid, aid2; /* Attribute IDs */ hid_t tid, tid2; /* Named datatype IDs */ ssize_t count; /* Count of open objects */ - hid_t * objs = NULL; /* Pointer to list of open objects */ + hid_t *objs = NULL; /* Pointer to list of open objects */ size_t u; /* Local index variable */ TESTING("force dangling IDs to close, from API routines"); diff --git a/test/direct_chunk.c b/test/direct_chunk.c index b2b7cba..1c4d6d7 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.c @@ -142,11 +142,11 @@ test_direct_chunk_write(hid_t file) size_t buf_size = CHUNK_NX * CHUNK_NY * sizeof(int); const Bytef *z_src = (const Bytef *)(direct_buf); - Bytef * z_dst = NULL; /*destination buffer */ + Bytef *z_dst = NULL; /*destination buffer */ uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size); uLong z_src_nbytes = (uLong)buf_size; int aggression = 9; /* Compression aggression setting */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ hsize_t start[2]; /* Start of hyperslab */ hsize_t stride[2]; /* Stride of hyperslab */ @@ -682,7 +682,7 @@ static size_t filter_bogus1(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ if (flags & H5Z_FLAG_REVERSE) { /* read */ @@ -718,7 +718,7 @@ static size_t filter_bogus2(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ if (flags & H5Z_FLAG_REVERSE) { /* read */ @@ -1463,7 +1463,7 @@ test_direct_chunk_read_no_cache(hid_t file) Bytef *z_dst = (Bytef *)(direct_buf); uLong z_dst_nbytes = (uLong)buf_size; int aggression = 9; /* Compression aggression setting */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ hsize_t start[2]; /* Start of hyperslab */ hsize_t stride[2]; /* Stride of hyperslab */ @@ -1636,12 +1636,12 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush) hsize_t offset[2]; /* chunk offset used for H5Dread_chunk */ size_t buf_size = CHUNK_NX * CHUNK_NY * sizeof(int); - Bytef * z_src = NULL; /* source buffer */ + Bytef *z_src = NULL; /* source buffer */ uLongf z_src_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size); - Bytef * z_dst = (Bytef *)(direct_buf); + Bytef *z_dst = (Bytef *)(direct_buf); uLong z_dst_nbytes = (uLong)buf_size; int aggression = 9; /* Compression aggression setting */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ hsize_t read_buf_size = 0; hsize_t start[2]; /* Start of hyperslab */ @@ -2167,7 +2167,7 @@ test_single_chunk(unsigned config) else /* Write the data to the dataset */ if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, (void *)wdata) < 0) - FAIL_STACK_ERROR; + FAIL_STACK_ERROR; /* * Close and release resources. @@ -2209,7 +2209,7 @@ test_single_chunk(unsigned config) else /* Read the data */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) - FAIL_STACK_ERROR; + FAIL_STACK_ERROR; /* Verify that the data read was correct. */ for (i = 0; i < DIM0; i++) diff --git a/test/dsets.c b/test/dsets.c index 151868b..fa0a39e 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -281,14 +281,14 @@ const char *FILENAME[] = {"dataset", /* 0 */ /* Shared global arrays */ #define DSET_DIM1 100 #define DSET_DIM2 200 -int ** points = NULL; -int * points_data = NULL; +int **points = NULL; +int *points_data = NULL; double **points_dbl = NULL; -double * points_dbl_data = NULL; -int ** check = NULL; -int * check_data = NULL; +double *points_dbl_data = NULL; +int **check = NULL; +int *check_data = NULL; double **check_dbl = NULL; -double * check_dbl_data = NULL; +double *check_dbl_data = NULL; size_t count_nbytes_read = 0; size_t count_nbytes_written = 0; @@ -537,11 +537,11 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) hid_t file = -1, dataset = -1, space = -1, xfer = -1; int i, j, n; hsize_t dims[2]; - void * tconv_buf = NULL; + void *tconv_buf = NULL; int f = -1; haddr_t offset; - int ** rdata = NULL; - int * rdata_bytes = NULL; + int **rdata = NULL; + int *rdata_bytes = NULL; TESTING("simple I/O"); @@ -701,8 +701,8 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hsize_t dims[2]; int f = -1; haddr_t offset; - int ** rdata = NULL; - int * rdata_bytes = NULL; + int **rdata = NULL; + int *rdata_bytes = NULL; TESTING("dataset offset with user block"); @@ -839,8 +839,8 @@ test_compact_io(hid_t fapl) int wbuf[16][8], rbuf[16][8]; char filename[FILENAME_BUF_SIZE]; H5F_libver_t low, high; /* File format bounds */ - H5F_t * fp; /* Internal file pointer */ - H5D_t * dsetp; /* Internal dataset pointer */ + H5F_t *fp; /* Internal file pointer */ + H5D_t *dsetp; /* Internal dataset pointer */ int i, j, n; /* Indices */ herr_t ret; /* Generic return value */ @@ -1057,8 +1057,8 @@ test_max_compact(hid_t fapl) hid_t plist = -1; hsize_t dims[1]; size_t compact_size; - int * wbuf = NULL; - int * rbuf = NULL; + int *wbuf = NULL; + int *rbuf = NULL; char filename[FILENAME_BUF_SIZE]; int n; size_t u; @@ -1368,7 +1368,7 @@ test_conv_buffer(hid_t fid) herr_t status = -1; int j, k, l; - CmpField * cf = NULL; + CmpField *cf = NULL; CmpFieldR *cfrR = NULL; hid_t dataset = H5I_INVALID_HID; /* dataset ID */ @@ -1539,7 +1539,7 @@ error: static herr_t test_tconv(hid_t file) { - char * out = NULL, *in = NULL; + char *out = NULL, *in = NULL; hsize_t dims[1]; hid_t space = -1, dataset = -1; int i; @@ -1742,7 +1742,7 @@ filter_bogus2(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_value /* "Compressing" */ else { unsigned add_on = cd_values[3]; /* Get "add on" value */ - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Add the "add on" value to all the data values */ @@ -1802,7 +1802,7 @@ static size_t filter_corrupt(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - void * data = NULL; + void *data = NULL; unsigned char *dst = (unsigned char *)(*buf); unsigned int offset; unsigned int length; @@ -1903,7 +1903,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, const hsize_t size[2] = {DSET_DIM1, DSET_DIM2}; /* Dataspace dimensions */ const hsize_t hs_offset[2] = {FILTER_HS_OFFSET1, FILTER_HS_OFFSET2}; /* Hyperslab offset */ const hsize_t hs_size[2] = {FILTER_HS_SIZE1, FILTER_HS_SIZE2}; /* Hyperslab size */ - void * tconv_buf = NULL; /* Temporary conversion buffer */ + void *tconv_buf = NULL; /* Temporary conversion buffer */ size_t i, j, n; /* Local index variables */ herr_t status; /* Error status */ @@ -2846,7 +2846,7 @@ test_missing_filter(hid_t file) hsize_t dset_size; /* Dataset size */ size_t i, j; /* Local index variables */ herr_t ret; /* Generic return value */ - const char * testfile = H5_get_srcdir_filename(FILE_DEFLATE_NAME); /* Corrected test file name */ + const char *testfile = H5_get_srcdir_filename(FILE_DEFLATE_NAME); /* Corrected test file name */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ TESTING("dataset access with missing filter"); @@ -4269,7 +4269,7 @@ test_nbit_compound_3(hid_t file) typedef struct { /* Struct with some no-op type fields */ int i; /* integer field, NOT a no-op type */ char str[30]; /* fixed-length string, no-op type */ - char * vl_str; /* varible-length string, no-op type */ + char *vl_str; /* varible-length string, no-op type */ hvl_t v; /* VL datatype field, no-op type */ hobj_ref_t r; /* Object reference field, no-op type */ unsigned char o[5]; /* Opaque field, no-op type */ @@ -4473,8 +4473,8 @@ test_nbit_int_size(hid_t file) hid_t dataspace, dataset, datatype, mem_datatype, dset_create_props; hsize_t dims[2], chunk_size[2]; hsize_t dset_size = 0; - int ** orig = NULL; - int * orig_data = NULL; + int **orig = NULL; + int *orig_data = NULL; double power; int i, j; size_t precision, offset; @@ -4654,7 +4654,7 @@ test_nbit_flt_size(hid_t file) hsize_t dims[2], chunk_size[2]; hsize_t dset_size = 0; float **orig = NULL; - float * orig_data = NULL; + float *orig_data = NULL; int i, j; size_t precision, offset; size_t spos, epos, esize, mpos, msize; @@ -7195,7 +7195,7 @@ auxread_fdata(hid_t fid, const char *name) hid_t ftype_id = -1; /* file data type ID */ hid_t mtype_id = -1; /* memory data type ID */ size_t msize; /* memory size of memory type */ - void * buf = NULL; /* data buffer */ + void *buf = NULL; /* data buffer */ hsize_t nelmts; /* number of elements in dataset */ int rank; /* rank of dataset */ hsize_t dims[H5S_MAX_RANK]; /* dimensions of dataset */ @@ -7569,12 +7569,12 @@ test_missing_chunk(hid_t file) hsize_t hs_start2[2], hs_stride2[2], hs_count2[2], hs_block2[2]; /* Hyperslab setting */ /* Buffers for reading/writing dataset */ - int * wdata = NULL; - int * rdata = NULL; + int *wdata = NULL; + int *rdata = NULL; int **wdata2 = NULL; int **rdata2 = NULL; - int * wdata2_bytes = NULL; - int * rdata2_bytes = NULL; + int *wdata2_bytes = NULL; + int *rdata2_bytes = NULL; /* Setting for 1-D dataset */ hsize_t dsize = 100, dmax = H5S_UNLIMITED; @@ -9034,12 +9034,12 @@ test_big_chunks_bypass_cache(hid_t fapl) /* Buffers for reading and writing data (1-D) */ int *wdata = NULL, *rdata1 = NULL, *rdata2 = NULL; /* Buffers for reading and writing data (2-D) */ - int ** t_wdata = NULL; - int ** t_rdata1 = NULL; - int ** t_rdata2 = NULL; - int * t_wdata_bytes = NULL; - int * t_rdata1_bytes = NULL; - int * t_rdata2_bytes = NULL; + int **t_wdata = NULL; + int **t_rdata1 = NULL; + int **t_rdata2 = NULL; + int *t_wdata_bytes = NULL; + int *t_rdata1_bytes = NULL; + int *t_rdata2_bytes = NULL; int i, j; /* Local index variables */ H5F_libver_t low; /* File format low bound */ H5D_chunk_index_t idx_type, t_idx_type; /* Dataset chunk index types */ @@ -9960,8 +9960,8 @@ test_chunk_fast_bug1(hid_t fapl) unsigned **wbuf = NULL; unsigned **rbuf = NULL; - unsigned * wbuf_bytes = NULL; - unsigned * rbuf_bytes = NULL; + unsigned *wbuf_bytes = NULL; + unsigned *rbuf_bytes = NULL; unsigned i, j; /* Local index variables */ @@ -10735,16 +10735,16 @@ test_fixed_array(hid_t fapl) int **chunks = NULL; /* # of chunks for dataset dimensions */ int **chunks_big = NULL; /* # of chunks for big dataset dimensions */ - int * chunks_bytes = NULL; - int * chunks_big_bytes = NULL; + int *chunks_bytes = NULL; + int *chunks_big_bytes = NULL; int chunk_row; /* chunk row index */ int chunk_col; /* chunk column index */ hsize_t **coord = NULL; /* datdaset coordinates */ hsize_t **coord_big = NULL; /* big datdaset coordinates */ - hsize_t * coord_bytes = NULL; - hsize_t * coord_big_bytes = NULL; + hsize_t *coord_bytes = NULL; + hsize_t *coord_big_bytes = NULL; H5D_chunk_index_t idx_type; /* Dataset chunk index type */ H5F_libver_t low, high; /* File format bounds */ @@ -11252,10 +11252,10 @@ test_single_chunk(hid_t fapl) hid_t did = -1, did_max = -1; /* Dataset ID for dataset with fixed dimensions */ hsize_t dim2[2] = {DSET_DIM1, DSET_DIM2}; /* Dataset dimensions */ hsize_t t_dim2[2] = {DSET_TMP_DIM1, DSET_TMP_DIM2}; /* Dataset dimensions */ - int * wbuf = NULL; /* write buffer */ - int * t_wbuf = NULL; /* write buffer */ - int * rbuf = NULL; /* read buffer */ - int * t_rbuf = NULL; /* read buffer */ + int *wbuf = NULL; /* write buffer */ + int *t_wbuf = NULL; /* write buffer */ + int *rbuf = NULL; /* read buffer */ + int *t_rbuf = NULL; /* read buffer */ H5D_chunk_index_t idx_type; /* Dataset chunk index type */ H5F_libver_t low, high; /* File format bounds */ @@ -11525,7 +11525,7 @@ test_idx_compatible(void) { hid_t fid = -1; /* File id */ hid_t did = -1; /* Dataset id */ - const char * filename = NULL; /* old test file name */ + const char *filename = NULL; /* old test file name */ unsigned j; /* Local index variable */ H5D_chunk_index_t idx_type; /* Chunked dataset index type */ @@ -13212,7 +13212,7 @@ error: *------------------------------------------------------------------------- */ typedef struct scatter_info_t { - int * src_buf; /* Source data buffer */ + int *src_buf; /* Source data buffer */ size_t block; /* Maximum number of elements to return to H5Dscatter() */ size_t size; /* Remaining number of elements to return */ } scatter_info_t; @@ -13524,7 +13524,7 @@ error: *------------------------------------------------------------------------- */ typedef struct gather_info_t { - int * expect_dst_buf; /* Expected destination data buffer */ + int *expect_dst_buf; /* Expected destination data buffer */ size_t max_nelmts; /* Maximum number of elements passed to callback */ hbool_t last_call; /* Whether this should be the last time the callback is called */ } gather_info_t; @@ -14497,7 +14497,7 @@ dls_01_main(void) int status = 0; hid_t fapl = 0, fid = 0; const char *strings[DLS_01_DIMS] = {"String 1", "Test string 2", "Another string", "Final String"}; - char * buffer = NULL; + char *buffer = NULL; TESTING("Testing DLS bugfix 1"); diff --git a/test/dt_arith.c b/test/dt_arith.c index 35a9d5d..f51ccd6 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -821,7 +821,7 @@ test_derived_flt(void) size_t spos, epos, esize, mpos, msize, size; size_t src_size, dst_size; unsigned char *buf = NULL, *saved_buf = NULL; - int * aligned = NULL; + int *aligned = NULL; int endian; /*endianess */ size_t nelmts = NTESTELEM; unsigned int fails_this_test = 0; @@ -1593,21 +1593,21 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) size_t fails_this_test; /*fails for this test */ char str[256]; /*hello string */ dtype_t src_type, dst_type; /*data types */ - const char * src_type_name = NULL; /*source type name */ - const char * dst_type_name = NULL; /*destination type name */ + const char *src_type_name = NULL; /*source type name */ + const char *dst_type_name = NULL; /*destination type name */ int endian; /*machine endianess */ size_t src_size, dst_size; /*type sizes */ - unsigned char * buf = NULL; /*buffer for conversion */ - unsigned char * saved = NULL; /*original values */ + unsigned char *buf = NULL; /*buffer for conversion */ + unsigned char *saved = NULL; /*original values */ size_t j, k; /*counters */ - unsigned char * hw = NULL; /*hardware conv result */ + unsigned char *hw = NULL; /*hardware conv result */ unsigned char src_bits[32]; /*src value in LE order */ unsigned char dst_bits[32]; /*dest value in LE order*/ size_t src_nbits; /*source length in bits */ size_t dst_nbits; /*dst length in bits */ H5T_sign_t src_sign; /*source sign type */ H5T_sign_t dst_sign; /*dst sign type */ - void * aligned = NULL; /*aligned temp buffer */ + void *aligned = NULL; /*aligned temp buffer */ signed char hw_char; unsigned char hw_uchar; short hw_short; @@ -2818,13 +2818,13 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) const size_t max_fails = 8; /*max number of failures*/ size_t fails_all_tests = 0; /*number of failures */ size_t fails_this_test; /*fails for this test */ - const char * src_type_name = NULL; /*source type name */ - const char * dst_type_name = NULL; /*destination type name */ + const char *src_type_name = NULL; /*source type name */ + const char *dst_type_name = NULL; /*destination type name */ size_t src_size, dst_size; /*type sizes */ unsigned char *buf = NULL; /*buffer for conversion */ unsigned char *saved = NULL; /*original values */ char str[256]; /*hello string */ - void * aligned = NULL; /*aligned buffer */ + void *aligned = NULL; /*aligned buffer */ float hw_f; /*hardware-converted */ double hw_d; /*hardware-converted */ #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE @@ -3421,7 +3421,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hid_t dxpl_id; /*dataset transfer property list*/ int fill_value = 9; /*fill value for conversion exception*/ H5T_conv_except_func_t op; /*returned callback function for conversion exception*/ - void * user_data; /*returned pointer to user data passed in to the callback*/ + void *user_data; /*returned pointer to user data passed in to the callback*/ hbool_t except_set = FALSE; /*whether user's exception handling is set*/ size_t nelmts = 0; /*num values per test */ const size_t max_fails = 40; /*max number of failures*/ @@ -3430,20 +3430,20 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) char str[256]; /*hello string */ dtype_t src_type; /*data types */ dtype_t dst_type; /*data types */ - const char * src_type_name = NULL; /*source type name */ - const char * dst_type_name = NULL; /*destination type name */ + const char *src_type_name = NULL; /*source type name */ + const char *dst_type_name = NULL; /*destination type name */ int sendian; /*source endianess */ int dendian; /*destination endianess */ size_t src_size, dst_size; /*type sizes */ - unsigned char * buf = NULL; /*buffer for conversion */ - unsigned char * saved = NULL; /*original values */ + unsigned char *buf = NULL; /*buffer for conversion */ + unsigned char *saved = NULL; /*original values */ size_t j, k; /*counters */ - unsigned char * hw = NULL; /*hardware conv result */ + unsigned char *hw = NULL; /*hardware conv result */ unsigned char src_bits[32]; /*src value in LE order */ unsigned char dst_bits[32]; /*dest value in LE order*/ size_t src_nbits; /*source length in bits */ size_t dst_nbits; /*dst length in bits */ - void * aligned = NULL; /*aligned temp buffer */ + void *aligned = NULL; /*aligned temp buffer */ float hw_float = 0; double hw_double = 0; long double hw_ldouble = 0; diff --git a/test/dtransform.c b/test/dtransform.c index 4685508..7b20bb2 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -858,7 +858,7 @@ test_getset(const hid_t dxpl_id_c_to_f) float windchillFfloatread[ROWS][COLS]; const char *simple = "(4/2) * ( (2 + 4)/(5 - 2.5))"; /* this equals 4.8 */ const char *c_to_f = "(9/5.0)*x + 32"; - char * ptrgetTest = NULL; + char *ptrgetTest = NULL; TESTING("H5Pget_data_transform") @@ -920,7 +920,7 @@ test_set(void) hid_t dxpl_id = -1; H5E_auto2_t func; const char *str = "(9/5.0)*x + 32"; - char * ptrgetTest = NULL; + char *ptrgetTest = NULL; TESTING("H5Pget_data_transform (get before set)") diff --git a/test/dtypes.c b/test/dtypes.c index 8aa57e2..ead27dc 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -583,7 +583,7 @@ test_compound_1(void) H5T_str_t strpad; H5T_order_t order; H5T_sign_t sign; - char * tag = NULL; + char *tag = NULL; int offset; herr_t ret; int retval = 1; @@ -1161,8 +1161,8 @@ test_compound_5(void) src_type_t src[2] = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}}; dst_type_t *dst; - void * buf = HDcalloc((size_t)2, sizeof(dst_type_t)); - void * bkg = HDcalloc((size_t)2, sizeof(dst_type_t)); + void *buf = HDcalloc((size_t)2, sizeof(dst_type_t)); + void *bkg = HDcalloc((size_t)2, sizeof(dst_type_t)); int retval = 1; TESTING("optimized struct converter"); @@ -2042,7 +2042,7 @@ test_compound_10(void) hid_t dset_id; hsize_t arr_dim[1] = {ARRAY_DIM}; /* Array dimensions */ hsize_t dim1[1]; - void * t1, *t2; + void *t1, *t2; char filename[1024]; size_t len; int i; @@ -2244,7 +2244,7 @@ test_compound_11(void) typedef struct { double d1; int i1; - char * s1; + char *s1; int i2; double d2; double d3; @@ -2253,7 +2253,7 @@ test_compound_11(void) typedef struct { double d1; int i1; - char * s1; + char *s1; } little_t; hid_t var_string_tid; /* Datatype IDs for type conversion */ @@ -2262,9 +2262,9 @@ test_compound_11(void) hid_t opaq_src_tid, opaq_dst_tid; /* Datatype IDs for type conversion */ hid_t space_id; /* Dataspace for buffer elements */ hsize_t dim[1]; /* Dimensions for dataspace */ - void * buf = NULL; /* Conversion buffer */ - void * buf_orig = NULL; /* Copy of original conversion buffer */ - void * bkg = NULL; /* Background buffer */ + void *buf = NULL; /* Conversion buffer */ + void *buf_orig = NULL; /* Copy of original conversion buffer */ + void *bkg = NULL; /* Background buffer */ size_t u; /* Local index variable */ int retval = 1; @@ -4944,7 +4944,7 @@ error: static int test_conv_str_2(void) { - char * buf = NULL, s[80]; + char *buf = NULL, s[80]; hid_t c_type = -1; hid_t f_type = -1; const size_t nelmts = NTESTELEM; @@ -5016,7 +5016,7 @@ error: static int test_conv_str_3(void) { - char * buf = NULL; + char *buf = NULL; hid_t type = -1; hid_t super = -1; const size_t nelmts = NTESTELEM; @@ -5025,7 +5025,7 @@ test_conv_str_3(void) size_t size; H5T_pad_t inpad; H5T_sign_t sign; - char * tag = NULL; + char *tag = NULL; herr_t ret; TESTING("some type functions for string"); @@ -5235,7 +5235,7 @@ static int test_conv_enum_2(void) { hid_t srctype = -1, dsttype = -1, oddsize = -1; - int * data = NULL, i, nerrors = 0; + int *data = NULL, i, nerrors = 0; const char *mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; TESTING("non-native enumeration type conversion"); @@ -5408,7 +5408,7 @@ test_bitfield_funcs(void) { hid_t type = -1, ntype = -1, super = -1; size_t size; - char * tag = 0; + char *tag = 0; H5T_pad_t inpad; H5T_cset_t cset; H5T_str_t strpad; @@ -5692,7 +5692,7 @@ error: static int opaque_long(void) { - char * long_tag = NULL; + char *long_tag = NULL; hid_t dt = -1; herr_t ret; @@ -6687,7 +6687,7 @@ test_int_float_except(void) (float)4.5F}; int buf_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 4}; float buf_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX + 1.0F, (float)INT_MAX - 127.0F, 4}; - int * intp; /* Pointer to buffer, as integers */ + int *intp; /* Pointer to buffer, as integers */ int buf2[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 72, 0}; float buf2_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX, (float)INT_MAX - 127.0F, (float)0.0F}; int buf2_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 0}; @@ -7249,8 +7249,8 @@ test_named_indirect_reopen(hid_t fapl) static hsize_t dims[1] = {3}; size_t dt_size; int enum_value; - const char * tag = "opaque_tag"; - char * tag_ret = NULL; + const char *tag = "opaque_tag"; + char *tag_ret = NULL; char filename[1024]; TESTING("indirectly reopening committed datatypes"); @@ -8116,9 +8116,9 @@ test_utf_ascii_conv(void) hid_t ascii_tid = -1; hid_t sid = -1; const char *utf8_w = "foo!"; - char * ascii_r = NULL; + char *ascii_r = NULL; const char *ascii_w = "bar!"; - char * utf8_r = NULL; + char *utf8_r = NULL; char filename[1024]; char ascii2[4], utf8_2[4]; herr_t status; @@ -8374,7 +8374,7 @@ verify_version(hid_t dtype, H5F_libver_t low, unsigned *highest_version) { hid_t base_dtype = -1; hid_t mem_dtype = -1; - H5T_t * dtypep = NULL; /* Internal structure of a datatype */ + H5T_t *dtypep = NULL; /* Internal structure of a datatype */ H5T_class_t type_cls = H5T_NO_CLASS; /* Temporary var for datatype class */ int nmembers = 0; unsigned i; @@ -8556,8 +8556,8 @@ test_versionbounds(void) hid_t simple_cmp_type = -1; /* Simple cmpd dtype, contains no other cmpd */ hid_t outer_arr_type = -1; /* Outermost array datatype */ hid_t inner_arr_type = -1; /* Inner array datatype */ - H5F_t * filep = NULL; /* Pointer to internal structure of a file */ - H5T_t * dtypep = NULL; /* Pointer to internal structure of a datatype */ + H5F_t *filep = NULL; /* Pointer to internal structure of a file */ + H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ H5F_libver_t low, high; /* File format bounds */ unsigned highest_version; /* Highest version in nested datatypes */ diff --git a/test/earray.c b/test/earray.c index eedf02f..fa9dd0a 100644 --- a/test/earray.c +++ b/test/earray.c @@ -602,7 +602,7 @@ static unsigned test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSED *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5EA_t *ea = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -847,7 +847,7 @@ static unsigned test_reopen(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5EA_t *ea = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -919,8 +919,8 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam) { hid_t file = -1; /* File ID */ hid_t file2 = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5F_t * f2 = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5F_t *f2 = NULL; /* Internal file object pointer */ H5EA_t *ea = NULL; /* Extensible array wrapper */ H5EA_t *ea2 = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -1032,8 +1032,8 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa hid_t file2 = -1; /* File ID */ hid_t file0 = -1; /* File ID */ hid_t file00 = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5F_t * f2 = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5F_t *f2 = NULL; /* Internal file object pointer */ H5EA_t *ea = NULL; /* Extensible array wrapper */ H5EA_t *ea2 = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -1168,9 +1168,9 @@ static unsigned test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5EA_t * ea = NULL; /* Extensible array wrapper */ - H5EA_t * ea2 = NULL; /* Extensible array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5EA_t *ea = NULL; /* Extensible array wrapper */ + H5EA_t *ea2 = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ h5_stat_size_t file_size; /* File size, after deleting array */ @@ -2069,9 +2069,9 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, h const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5EA_t * ea = NULL; /* Extensible array wrapper */ - void * eiter_info; /* Extensible array iterator info */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5EA_t *ea = NULL; /* Extensible array wrapper */ + void *eiter_info; /* Extensible array iterator info */ earray_state_t state; /* State of extensible array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ @@ -2247,8 +2247,8 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5EA_t * ea = NULL; /* Extensible array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5EA_t *ea = NULL; /* Extensible array wrapper */ earray_state_t state; /* State of extensible array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c index d34f500..6b77921 100644 --- a/test/enc_dec_plist.c +++ b/test/enc_dec_plist.c @@ -23,7 +23,7 @@ static int test_encode_decode(hid_t orig_pl) { hid_t pl = (-1); /* Decoded property list */ - void * temp_buf = NULL; /* Pointer to encoding buffer */ + void *temp_buf = NULL; /* Pointer to encoding buffer */ size_t temp_size = 0; /* Size of encoding buffer */ /* first call to encode returns only the size of the buffer needed */ diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c index 9ea5cf9..8fb6d0b 100644 --- a/test/enc_dec_plist_cross_platform.c +++ b/test/enc_dec_plist_cross_platform.c @@ -162,7 +162,7 @@ test_plists(const char *filename_prefix) unsigned config_1, config_2; int fd_1, fd_2; size_t size_1 = 0, size_2 = 0; - void * buf_1 = NULL, *buf_2 = NULL; + void *buf_1 = NULL, *buf_2 = NULL; hid_t plist_1, plist_2; char filename[1024]; const char *testfile; diff --git a/test/err_compat.c b/test/err_compat.c index 6ad69d8..dbf8581 100644 --- a/test/err_compat.c +++ b/test/err_compat.c @@ -35,8 +35,8 @@ const char *FILENAME[] = {"errors_compat", NULL}; int **ipoints2 = NULL; int **icheck2 = NULL; -int * ipoints2_data = NULL; -int * icheck2_data = NULL; +int *ipoints2_data = NULL; +int *icheck2_data = NULL; #define DSET_NAME "a_dataset" @@ -115,9 +115,9 @@ error: herr_t custom_print_cb1(int n, H5E_error1_t *err_desc, void *client_data) { - FILE * stream = (FILE *)client_data; - char * maj = NULL; - char * min = NULL; + FILE *stream = (FILE *)client_data; + char *maj = NULL; + char *min = NULL; const int indent = 4; if (NULL == (min = H5Eget_minor(err_desc->min_num))) @@ -162,9 +162,9 @@ error: herr_t custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data) { - FILE * stream = (FILE *)client_data; - char * maj = NULL; - char * min = NULL; + FILE *stream = (FILE *)client_data; + char *maj = NULL; + char *min = NULL; const int indent = 4; if (NULL == (min = H5Eget_minor(err_desc->min_num))) @@ -213,7 +213,7 @@ test_error_compat(void) hsize_t dims[2]; H5E_auto1_t old_func1; H5E_auto2_t old_func2; - void * old_data = NULL; + void *old_data = NULL; herr_t ret; TESTING("error API H5Eset/get_auto"); diff --git a/test/error_test.c b/test/error_test.c index f470318..6765ed8 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -38,8 +38,8 @@ const char *FILENAME[] = {"errors", NULL}; int **ipoints2 = NULL; int **icheck2 = NULL; -int * ipoints2_data = NULL; -int * icheck2_data = NULL; +int *ipoints2_data = NULL; +int *icheck2_data = NULL; hid_t ERR_CLS; hid_t ERR_CLS2; @@ -99,7 +99,7 @@ test_error(hid_t file) hsize_t dims[2]; const char *FUNC_test_error = "test_error"; H5E_auto2_t old_func; - void * old_data = NULL; + void *old_data = NULL; HDfprintf(stderr, "\nTesting error API based on data I/O\n"); @@ -181,8 +181,8 @@ init_error(void) { ssize_t cls_size = (ssize_t)HDstrlen(ERR_CLS_NAME) + 1; ssize_t msg_size = (ssize_t)HDstrlen(ERR_MIN_SUBROUTINE_MSG) + 1; - char * cls_name = NULL; - char * msg = NULL; + char *cls_name = NULL; + char *msg = NULL; H5E_type_t msg_type; if (NULL == (cls_name = (char *)HDmalloc(HDstrlen(ERR_CLS_NAME) + 1))) @@ -324,8 +324,8 @@ static herr_t test_long_desc(void) { const char *format = "Testing very long description string, %s"; - char * long_desc = NULL; - char * full_desc = NULL; + char *long_desc = NULL; + char *full_desc = NULL; size_t u; const char *test_FUNC = "test_long_desc"; @@ -419,7 +419,7 @@ error: static herr_t custom_print_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) { - FILE * stream = (FILE *)client_data; + FILE *stream = (FILE *)client_data; char maj[MSG_SIZE]; char min[MSG_SIZE]; char cls[MSG_SIZE]; diff --git a/test/evict_on_close.c b/test/evict_on_close.c index 472da13..e9bd07f 100644 --- a/test/evict_on_close.c +++ b/test/evict_on_close.c @@ -135,7 +135,7 @@ generate_eoc_test_file(hid_t fapl_id) hsize_t chunk_dims[2]; /* chunk dimensions */ H5D_chunk_index_t idx_type; /* dataset chunk index type */ H5D_layout_t layout_type; /* dataset layout type */ - int * data = NULL; /* buffer for fake data */ + int *data = NULL; /* buffer for fake data */ int n; /* # of data elements */ int i; /* iterator (# subgroups) */ @@ -584,9 +584,9 @@ error: static herr_t check_group_layout(hid_t fid, const char *group_name) { - H5F_t * file_ptr = NULL; /* ptr to internal file struct */ + H5F_t *file_ptr = NULL; /* ptr to internal file struct */ hid_t gid1 = -1, gid2 = -1; /* group IDs */ - H5G_t * grp_ptr = NULL; /* ptr to internal group struct */ + H5G_t *grp_ptr = NULL; /* ptr to internal group struct */ haddr_t tag1, tag2; /* MD cache tags for groups */ uint32_t before, during, after; /* cache sizes */ int i; /* iterator */ @@ -698,11 +698,11 @@ error: static herr_t check_dset_scheme(hid_t fid, const char *dset_name) { - H5F_t * file_ptr = NULL; /* ptr to internal file struct */ + H5F_t *file_ptr = NULL; /* ptr to internal file struct */ hid_t did = -1; /* dataset ID */ - H5D_t * dset_ptr = NULL; /* ptr to internal dset struct */ + H5D_t *dset_ptr = NULL; /* ptr to internal dset struct */ haddr_t tag; /* MD cache tag for dataset */ - int * data = NULL; /* buffer for fake data */ + int *data = NULL; /* buffer for fake data */ uint32_t before, during, after; /* cache sizes */ /* NOTE: The TESTING() macro is called in main() */ diff --git a/test/extend.c b/test/extend.c index 2583de9..0c28c71 100644 --- a/test/extend.c +++ b/test/extend.c @@ -29,9 +29,9 @@ const char *FILENAME[] = {"extend", NULL}; /* Data buffers */ static int **buf1 = NULL; -static int * buf1_data = NULL; +static int *buf1_data = NULL; static int **buf2 = NULL; -static int * buf2_data = NULL; +static int *buf2_data = NULL; /*------------------------------------------------------------------------- * Function: write_data diff --git a/test/external.c b/test/external.c index c31701d..b3250c1 100644 --- a/test/external.c +++ b/test/external.c @@ -1319,7 +1319,7 @@ test_h5d_get_access_plist(hid_t fapl_id) hid_t sid = -1; /* data space */ hid_t did = -1; /* dataset */ hsize_t dims = 0; /* dataset size */ - char * buffer = NULL; /* saved prefix name from dapl */ + char *buffer = NULL; /* saved prefix name from dapl */ char filename[1024]; /* file names */ TESTING("H5Dget_access_plist() returns correct prefix"); diff --git a/test/farray.c b/test/farray.c index a93abd4..9f7e43f 100644 --- a/test/farray.c +++ b/test/farray.c @@ -419,7 +419,7 @@ static unsigned test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSED *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FA_t *fa = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -547,7 +547,7 @@ static unsigned test_reopen(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FA_t *fa = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -616,8 +616,8 @@ test_open_twice(hid_t fapl_id, H5FA_create_t *cparam, farray_test_param_t *tpara { hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fid2 = H5I_INVALID_HID; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5F_t * f2 = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5F_t *f2 = NULL; /* Internal file object pointer */ H5FA_t *fa = NULL; /* Fixed array wrapper */ H5FA_t *fa2 = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -727,8 +727,8 @@ test_open_twice_diff(hid_t fapl_id, H5FA_create_t *cparam, farray_test_param_t * hid_t fid2 = H5I_INVALID_HID; /* File ID */ hid_t fid0 = H5I_INVALID_HID; /* File ID */ hid_t fid00 = H5I_INVALID_HID; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5F_t * f2 = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5F_t *f2 = NULL; /* Internal file object pointer */ H5FA_t *fa = NULL; /* Fixed array wrapper */ H5FA_t *fa2 = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -854,9 +854,9 @@ static unsigned test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FA_t * fa = NULL; /* Fixed array wrapper */ - H5FA_t * fa2 = NULL; /* Fixed array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FA_t *fa = NULL; /* Fixed array wrapper */ + H5FA_t *fa2 = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ h5_stat_size_t file_size; /* File size, after deleting array */ @@ -1344,9 +1344,9 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, h const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FA_t * fa = NULL; /* Fixed array wrapper */ - void * fiter_info; /* Fixed array iterator info */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FA_t *fa = NULL; /* Fixed array wrapper */ + void *fiter_info; /* Fixed array iterator info */ farray_state_t state; /* State of fixed array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ @@ -1502,8 +1502,8 @@ test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, hbool_t check_rest, const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FA_t * fa = NULL; /* Extensible array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FA_t *fa = NULL; /* Extensible array wrapper */ farray_state_t state; /* State of extensible array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ diff --git a/test/fheap.c b/test/fheap.c index e075a64..8969ab4 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -157,8 +157,8 @@ typedef struct fheap_heap_ids_t { size_t num_ids; /* # of heap IDs in array */ size_t alloc_ids; /* # of heap IDs allocated in array */ unsigned char *ids; /* Array of object heap IDs */ - size_t * lens; /* Array of object lengths */ - size_t * offs; /* Array of object offsets (in global shared write buffer) */ + size_t *lens; /* Array of object lengths */ + size_t *offs; /* Array of object offsets (in global shared write buffer) */ } fheap_heap_ids_t; /* Local variables */ @@ -166,8 +166,8 @@ unsigned char *shared_wobj_g; /* Pointer to shared write buffer for unsigned char *shared_robj_g; /* Pointer to shared read buffer for objects */ size_t shared_obj_size_g; /* Size of shared objects */ unsigned char *shared_ids_g = NULL; /* Array of shared object heap IDs */ -size_t * shared_lens_g = NULL; /* Array of shared object lengths */ -size_t * shared_offs_g = NULL; /* Array of shared object offsets */ +size_t *shared_lens_g = NULL; /* Array of shared object lengths */ +size_t *shared_offs_g = NULL; /* Array of shared object offsets */ size_t shared_alloc_ids_g = 0; /* # of shared heap IDs allocated in array */ /* Local routines */ @@ -432,8 +432,8 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, /* Check for needing to increase size of heap ID array */ if (keep_ids->num_ids + 1 > keep_ids->alloc_ids) { unsigned char *tmp_ids; - size_t * tmp_lens; - size_t * tmp_offs; + size_t *tmp_lens; + size_t *tmp_offs; keep_ids->alloc_ids = MAX(1024, (keep_ids->alloc_ids * 2)); if (NULL == @@ -1053,8 +1053,8 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s { unsigned char *wobj; /* Buffer for object to insert */ unsigned char *curr_id_ptr; /* Pointer into shared ID array */ - size_t * curr_len_ptr; /* Pointer into shared length array */ - size_t * curr_off_ptr; /* Pointer into shared offset array */ + size_t *curr_len_ptr; /* Pointer into shared length array */ + size_t *curr_off_ptr; /* Pointer into shared offset array */ size_t num_ids = 0; /* # of heap IDs in array */ size_t data_size; /* Size of data portion of heap block */ size_t last_obj_len; /* Size of last object inserted into heap */ @@ -1834,9 +1834,9 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Heap address in file */ h5_stat_size_t empty_size; /* File size, w/o heap */ h5_stat_size_t file_size; /* File size, after deleting heap */ @@ -1953,9 +1953,9 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ h5_stat_size_t empty_size; /* File size, w/o heap */ h5_stat_size_t file_size; /* File size, after deleting heap */ @@ -2107,11 +2107,11 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) hid_t file = -1; /* File ID */ hid_t file2 = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5F_t * f2 = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5F_t *f2 = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ - H5HF_t * fh2 = NULL; /* 2nd fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh2 = NULL; /* 2nd fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ h5_stat_size_t empty_size; /* File size, w/o heap */ h5_stat_size_t file_size; /* File size, after deleting heap */ @@ -2284,10 +2284,10 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ - H5HF_t * fh2 = NULL; /* 2nd fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh2 = NULL; /* 2nd fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -2462,8 +2462,8 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ unsigned deflate_level; /* Deflation level */ size_t id_len; /* Size of fractal heap IDs */ @@ -2800,8 +2800,8 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ H5HF_create_t test_cparam; /* Temporary local heap creation parameters */ @@ -2922,7 +2922,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ hsize_t empty_heap_size; /* Total size of empty heap on disk */ @@ -3065,7 +3065,7 @@ test_reopen_hdr(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) hid_t file1 = -1; /* File ID */ hid_t file2 = -2; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ hsize_t heap_size; /* Total size of heap on disk */ @@ -3196,8 +3196,8 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ size_t id_len; /* Size of fractal heap IDs */ @@ -3311,8 +3311,8 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -3412,8 +3412,8 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -3508,8 +3508,8 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3607,8 +3607,8 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3713,8 +3713,8 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3820,8 +3820,8 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3931,8 +3931,8 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4027,8 +4027,8 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4130,8 +4130,8 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4231,8 +4231,8 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4341,8 +4341,8 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4439,8 +4439,8 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4535,8 +4535,8 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4637,8 +4637,8 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4747,8 +4747,8 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4850,8 +4850,8 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4961,8 +4961,8 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5069,8 +5069,8 @@ test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_te { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5167,8 +5167,8 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5276,8 +5276,8 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5379,8 +5379,8 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5489,8 +5489,8 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5600,8 +5600,8 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5708,8 +5708,8 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5817,8 +5817,8 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5932,8 +5932,8 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -6053,8 +6053,8 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -6165,8 +6165,8 @@ test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -6279,8 +6279,8 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -6406,8 +6406,8 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ unsigned long seed = 0; /* Random # seed */ @@ -6566,8 +6566,8 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ unsigned char obj[SMALL_OBJ_SIZE1]; /* Buffer for object to insert */ @@ -6730,8 +6730,8 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */ unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for second object */ @@ -6924,11 +6924,11 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ - unsigned char * obj; /* Buffer for object to insert */ + unsigned char *obj; /* Buffer for object to insert */ size_t obj_len; /* Length of object to insert */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7093,12 +7093,12 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */ unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for second object */ - unsigned char * obj; /* Buffer for object to insert */ + unsigned char *obj; /* Buffer for object to insert */ size_t obj_len; /* Length of object to insert */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7333,13 +7333,13 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */ unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for second object */ unsigned char heap_id3[HEAP_ID_LEN]; /* Heap ID for third object */ - unsigned char * obj; /* Buffer for object to insert */ + unsigned char *obj; /* Buffer for object to insert */ size_t obj_len; /* Length of object to insert */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7631,11 +7631,11 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char **heap_id = NULL; - unsigned char * heap_id_data = NULL; + unsigned char *heap_id_data = NULL; struct a_type_t1 { char a[10]; char b[40]; @@ -7761,8 +7761,8 @@ test_man_remove_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7834,8 +7834,8 @@ test_man_remove_two_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7922,8 +7922,8 @@ test_man_remove_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7992,8 +7992,8 @@ test_man_remove_first_two_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_par { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8064,8 +8064,8 @@ test_man_remove_first_four_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8140,8 +8140,8 @@ test_man_remove_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8210,8 +8210,8 @@ test_man_remove_2nd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8284,8 +8284,8 @@ test_man_remove_3rd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8365,8 +8365,8 @@ test_man_skip_start_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8444,8 +8444,8 @@ test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8543,8 +8543,8 @@ test_man_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8653,8 +8653,8 @@ test_man_skip_2nd_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8750,8 +8750,8 @@ test_man_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_tes { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8896,8 +8896,8 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t * { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -9062,8 +9062,8 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -9190,8 +9190,8 @@ test_man_skip_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned num_direct_rows; /* Number of rows (of direct blocks) in root indirect block */ @@ -9318,8 +9318,8 @@ test_man_fill_direct_skip_indirect_start_block_add_skipped(hid_t fapl, H5HF_crea { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -9443,8 +9443,8 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the */ @@ -9575,12 +9575,12 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -9721,13 +9721,13 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5 { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ - unsigned row; /* Current row in indirect block */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + unsigned row; /* Current row in indirect block */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -9884,12 +9884,12 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ @@ -10040,12 +10040,12 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ @@ -10224,8 +10224,8 @@ test_man_fill_2nd_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -10355,8 +10355,8 @@ test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -10492,17 +10492,17 @@ error: */ static unsigned test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(hid_t fapl, - H5HF_create_t * cparam, + H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -10645,17 +10645,17 @@ error: */ static unsigned test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(hid_t fapl, - H5HF_create_t * cparam, + H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -10807,12 +10807,12 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -10971,18 +10971,18 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ unsigned u; /* Local index variables */ /* Test description */ - const char * base_desc = + const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd level indirect " "blocks, fill all direct blocks in next 3rd level indirect block, fill all 1st row of 2nd level " "indirect blocks, except last one, and insert object too large for 2nd level indirect block, then " @@ -11139,12 +11139,12 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5 { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11302,12 +11302,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11485,12 +11485,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11705,12 +11705,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11905,12 +11905,12 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_ { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -12134,8 +12134,8 @@ test_man_frag_simple(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -12265,8 +12265,8 @@ test_man_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned root_direct_rows; /* Number of rows in root indirect block */ @@ -12436,12 +12436,12 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -12548,8 +12548,8 @@ test_man_frag_3rd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned root_direct_rows; /* Number of rows in root indirect block */ @@ -12662,14 +12662,14 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for object */ + unsigned char *heap_id = NULL; /* Heap ID for object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -12812,15 +12812,15 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13042,16 +13042,16 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ - unsigned char * heap_id3 = NULL; /* Heap ID for third object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id3 = NULL; /* Heap ID for third object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13347,18 +13347,18 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ - unsigned char * heap_id3 = NULL; /* Heap ID for third object */ - unsigned char * heap_id4 = NULL; /* Heap ID for fourth object */ - unsigned char * heap_id5 = NULL; /* Heap ID for fifth object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id3 = NULL; /* Heap ID for third object */ + unsigned char *heap_id4 = NULL; /* Heap ID for fourth object */ + unsigned char *heap_id5 = NULL; /* Heap ID for fifth object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13770,15 +13770,15 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for object */ + unsigned char *heap_id = NULL; /* Heap ID for object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13979,14 +13979,14 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for object */ + unsigned char *heap_id = NULL; /* Heap ID for object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -14129,15 +14129,15 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -14360,20 +14360,20 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ - unsigned char * heap_id3 = NULL; /* Heap ID for third object */ - unsigned char * heap_id4 = NULL; /* Heap ID for fourth object */ - unsigned char * heap_id5 = NULL; /* Heap ID for fifth object */ - unsigned char * heap_id6 = NULL; /* Heap ID for sixth object */ - unsigned char * heap_id7 = NULL; /* Heap ID for seventh object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id3 = NULL; /* Heap ID for third object */ + unsigned char *heap_id4 = NULL; /* Heap ID for fourth object */ + unsigned char *heap_id5 = NULL; /* Heap ID for fifth object */ + unsigned char *heap_id6 = NULL; /* Heap ID for sixth object */ + unsigned char *heap_id7 = NULL; /* Heap ID for seventh object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -14964,8 +14964,8 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ @@ -15137,8 +15137,8 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ @@ -15467,8 +15467,8 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ size_t id_len; /* Size of fractal heap IDs */ @@ -15668,8 +15668,8 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ size_t id_len; /* Size of fractal heap IDs */ @@ -15891,15 +15891,15 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ size_t id_len; /* Size of fractal heap IDs */ unsigned char tiny_heap_id[HEAP_ID_LEN]; /* Heap ID for 'tiny' object */ unsigned char huge_heap_id[HEAP_ID_LEN]; /* Heap ID for 'huge' object */ hbool_t id_changed = FALSE; /* Whether the heap ID changed */ - unsigned char * rewrite_obj = NULL; /* Pointer to re-write buffer for objects */ + unsigned char *rewrite_obj = NULL; /* Pointer to re-write buffer for objects */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ @@ -16171,8 +16171,8 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ diff --git a/test/file_image.c b/test/file_image.c index 0373468..57f0ac6 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -85,10 +85,10 @@ test_properties(void) { hid_t fapl_1 = -1; hid_t fapl_2 = -1; - char * buffer = 0; + char *buffer = 0; int count = 10; - void * temp = 0; - char * temp2 = 0; + void *temp = 0; + char *temp2 = 0; int i; size_t size; size_t temp_size; @@ -339,9 +339,9 @@ test_callbacks(void) H5FD_file_image_callbacks_t callbacks; hid_t fapl_1; hid_t fapl_2; - udata_t * udata = NULL; - char * file_image = NULL; - char * temp_file_image; + udata_t *udata = NULL; + char *file_image = NULL; + char *temp_file_image; int count = 10; int i; size_t size; @@ -556,11 +556,11 @@ test_core(void) hid_t file; hid_t dset; hid_t space; - udata_t * udata; - unsigned char * file_image; + udata_t *udata; + unsigned char *file_image; char filename[1024]; char copied_filename[1024]; - const char * tmp = NULL; + const char *tmp = NULL; size_t size; hsize_t dims[2]; int fd; @@ -717,9 +717,9 @@ static int test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl, hbool_t user) { char file_name[1024] = "\0"; - void * insertion_ptr = NULL; - void * image_ptr = NULL; - void * file_image_ptr = NULL; + void *insertion_ptr = NULL; + void *image_ptr = NULL; + void *file_image_ptr = NULL; hbool_t is_family_file = FALSE; hbool_t identical; int data[100]; @@ -996,7 +996,7 @@ test_get_file_image_error_rejection(void) { const char *memb_name[H5FD_MEM_NTYPES]; char file_name[1024] = "\0"; - void * image_ptr = NULL; + void *image_ptr = NULL; int data[100]; int i; hid_t fapl_id = -1; diff --git a/test/fillval.c b/test/fillval.c index 7bae587..be3ad14 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -298,8 +298,8 @@ test_getset_vl(hid_t fapl) hid_t fileid = (-1), spaceid = (-1), dtypeid = (-1), datasetid = (-1), plistid = (-1); char fill_value[] = "aaaa"; char orig_fill_value[] = "aaaa"; - char * f1 = fill_value; - char * f2; + char *f1 = fill_value; + char *f2; char filename[1024]; TESTING("property lists, with variable-length datatype"); @@ -886,7 +886,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f int i, j, *buf = NULL, odd; unsigned u; comp_datatype rd_c, fill_c, should_be_c; - comp_datatype * buf_c = NULL; + comp_datatype *buf_c = NULL; H5D_space_status_t allocation; fill_c.a = 0; @@ -1414,7 +1414,7 @@ error: static int test_extend_init_integer(void *_buf, size_t nelmts, const void *_val) { - int * buf = (int *)_buf; /* Buffer to initialize */ + int *buf = (int *)_buf; /* Buffer to initialize */ const int *val = (const int *)_val; /* Value to use */ while (nelmts) { @@ -1497,7 +1497,7 @@ test_extend_release_integer(void H5_ATTR_UNUSED *_elmt) static int test_extend_init_cmpd_vl(void *_buf, size_t nelmts, const void *_val) { - comp_vl_datatype * buf = (comp_vl_datatype *)_buf; /* Buffer to initialize */ + comp_vl_datatype *buf = (comp_vl_datatype *)_buf; /* Buffer to initialize */ const comp_vl_datatype *val = (const comp_vl_datatype *)_val; /* Value to use */ while (nelmts) { @@ -1609,12 +1609,12 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t int (*verify_rtn)(unsigned, const hsize_t *, const void *, const void *); int (*release_rtn)(void *); size_t val_size; /* Size of element */ - void * val_rd, *odd_val; - const void * init_val, *should_be, *even_val; + void *val_rd, *odd_val; + const void *init_val, *should_be, *even_val; int val_rd_i, init_val_i = 9999; comp_vl_datatype init_val_c = {87, NULL, NULL, 129}; comp_vl_datatype val_rd_c; - void * buf = NULL; + void *buf = NULL; unsigned odd; /* Whether an odd or even coord. was read */ unsigned i, j; /* Local index variables */ @@ -2238,7 +2238,7 @@ test_compatible(void) hsize_t dims[2], one[2] = {1, 1}; hsize_t hs_offset[2] = {3, 4}; H5D_fill_value_t status; - const char * testfile = H5_get_srcdir_filename(FILE_COMPATIBLE); /* Corrected test file name */ + const char *testfile = H5_get_srcdir_filename(FILE_COMPATIBLE); /* Corrected test file name */ TESTING("contiguous dataset compatibility with v. 1.4"); diff --git a/test/filter_fail.c b/test/filter_fail.c index a1bcf28..cd264ee 100644 --- a/test/filter_fail.c +++ b/test/filter_fail.c @@ -60,7 +60,7 @@ static size_t filter_fail(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * dst = (int *)(*buf); + int *dst = (int *)(*buf); size_t ret_value = 0; if (flags & H5Z_FLAG_REVERSE) { /* do nothing during read */ diff --git a/test/filter_plugin.c b/test/filter_plugin.c index 276141a..ea5c000 100644 --- a/test/filter_plugin.c +++ b/test/filter_plugin.c @@ -180,15 +180,15 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) hid_t dxpl_id = -1; /* Dataset xfer property list ID */ hid_t write_dxpl_id = -1; /* Dataset xfer property list ID for writing */ hid_t sid = -1; /* Dataspace ID */ - void * tconv_buf = NULL; /* Temporary conversion buffer */ - int ** orig = NULL; /* Data written to the dataset */ - int ** read = NULL; /* Data read from the dataset */ + void *tconv_buf = NULL; /* Temporary conversion buffer */ + int **orig = NULL; /* Data written to the dataset */ + int **read = NULL; /* Data read from the dataset */ size_t r, c; /* Data rows and columns */ size_t hs_r, hs_c, hs_offr, hs_offc; /* Hypserslab sizes and offsets */ size_t i, j; /* Local index variables */ int n = 0; /* Value written to point array */ hbool_t are_same; /* Output from dataset compare function */ - int *** save_array = NULL; /* (Global) array where the final data go */ + int ***save_array = NULL; /* (Global) array where the final data go */ /* initialize */ r = (size_t)sizes_g[0]; @@ -587,8 +587,8 @@ error: static herr_t test_read_data(hid_t did, int *origin_data) { - int ** check = NULL; - int * data_p = origin_data; + int **check = NULL; + int *data_p = origin_data; size_t i, j; /* Local index variables */ if (allocate_and_init_2D_array(&check, sizes_g, NULL) < 0) @@ -727,7 +727,7 @@ error: static herr_t ensure_data_read_fails(hid_t did) { - int ** check = NULL; + int **check = NULL; herr_t ret = FAIL; if (allocate_and_init_2D_array(&check, sizes_g, NULL) < 0) diff --git a/test/filter_plugin1_dsets.c b/test/filter_plugin1_dsets.c index 5d6c1ef..b22ba24 100644 --- a/test/filter_plugin1_dsets.c +++ b/test/filter_plugin1_dsets.c @@ -64,7 +64,7 @@ static size_t add_sub_value(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ int value = 0; /* Data value to add/subtract */ diff --git a/test/filter_plugin2_dsets.c b/test/filter_plugin2_dsets.c index d2011d4..fed8176 100644 --- a/test/filter_plugin2_dsets.c +++ b/test/filter_plugin2_dsets.c @@ -65,7 +65,7 @@ static size_t mult_div_value(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Check for the correct number of parameters */ diff --git a/test/filter_plugin3_dsets.c b/test/filter_plugin3_dsets.c index 618ce06..e8103a3 100644 --- a/test/filter_plugin3_dsets.c +++ b/test/filter_plugin3_dsets.c @@ -72,7 +72,7 @@ static size_t add_sub_value_hdf5(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ int value = 0; /* Data value to add/subtract */ unsigned majnum = 0; /* Output data from the HDF5 library call */ diff --git a/test/filter_plugin4_groups.c b/test/filter_plugin4_groups.c index 630dcd6..97cb59a 100644 --- a/test/filter_plugin4_groups.c +++ b/test/filter_plugin4_groups.c @@ -82,7 +82,7 @@ append_to_group_name(unsigned int flags, size_t cd_nelmts, const unsigned int *c } else { /* WRITE - Append the suffix to the group name */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ unsigned char *dst = NULL; /* Temporary pointer to destination buffer */ /* Get memory for the new, larger string buffer using the diff --git a/test/flush1.c b/test/flush1.c index 456f5f4..1edc0d4 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -123,7 +123,7 @@ add_dset_to_file(hid_t fid, const char *dset_name) hid_t dcpl_id = -1; /* dataset creation plist ID */ hid_t sid = -1; /* dataspace ID */ hid_t did = -1; /* dataset ID */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t dims[1] = {NELEMENTS}; /* size of dataset */ hsize_t chunk_dims[1] = {CHUNK_SIZE}; /* chunk size */ int i; /* iterator */ @@ -189,7 +189,7 @@ error: int main(void) { - char * driver = NULL; /* name of current VFD (from env var) */ + char *driver = NULL; /* name of current VFD (from env var) */ hbool_t vfd_supports_swmr; /* whether the current VFD supports SWMR */ hid_t fid = -1; /* file ID */ hid_t fapl_id = -1; /* file access proplist ID */ diff --git a/test/flush2.c b/test/flush2.c index 3262b14..bde0ae8 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -63,7 +63,7 @@ dset_ok(hid_t fid, const char *dset_name) { hid_t sid = -1; /* dataspace ID */ hid_t did = -1; /* dataset ID */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t dims[1] = {0}; /* size of dataset */ int i; /* iterator */ @@ -239,7 +239,7 @@ error: int main(void) { - char * driver = NULL; /* name of current VFD (from env var) */ + char *driver = NULL; /* name of current VFD (from env var) */ hbool_t vfd_supports_swmr; /* whether the current VFD supports SWMR */ hid_t fapl_id = -1; /* file access proplist ID */ char filename[1024]; /* filename */ diff --git a/test/freespace.c b/test/freespace.c index 6cab2bf..83c7a60 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -238,7 +238,7 @@ static herr_t TEST_sect_merging(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata) { TEST_free_section_t **sect1 = (TEST_free_section_t **)_sect1; - TEST_free_section_t * sect2 = (TEST_free_section_t *)_sect2; + TEST_free_section_t *sect2 = (TEST_free_section_t *)_sect2; herr_t ret_value = SUCCEED; /* Return value */ /* Check arguments. */ @@ -284,7 +284,7 @@ TEST_sect_free(H5FS_section_info_t *sect) static herr_t TEST_sect_can_shrink(const H5FS_section_info_t *_sect, void *_udata) { - unsigned * can_shrink = (unsigned *)_udata; + unsigned *can_shrink = (unsigned *)_udata; const TEST_free_section_t *sect = (const TEST_free_section_t *)_sect; haddr_t end, eoa; @@ -309,7 +309,7 @@ static herr_t TEST_sect_shrinking(H5FS_section_info_t **_sect, void *_udata) { TEST_free_section_t **sect = (TEST_free_section_t **)_sect; - unsigned * can_shrink = (unsigned *)_udata; + unsigned *can_shrink = (unsigned *)_udata; /* address of the section is faked, so, doesn't need to do anything */ /* just free the section node */ @@ -331,7 +331,7 @@ static herr_t TEST_sects_cb(H5FS_section_info_t *_sect, void *_udata) { TEST_free_section_t *sect = (TEST_free_section_t *)_sect; - TEST_iter_ud_t * udata = (TEST_iter_ud_t *)_udata; + TEST_iter_ud_t *udata = (TEST_iter_ud_t *)_udata; herr_t ret_value = SUCCEED; /* Return value */ HDassert(sect); @@ -443,8 +443,8 @@ test_fs_create(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr; /* address of free space */ h5_stat_size_t file_size, empty_size; /* File size */ frspace_state_t state; /* State of free space*/ @@ -584,8 +584,8 @@ test_fs_sect_add(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -920,8 +920,8 @@ test_fs_sect_find(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -1304,8 +1304,8 @@ test_fs_sect_merge(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -1782,8 +1782,8 @@ test_fs_sect_shrink(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2129,8 +2129,8 @@ test_fs_sect_change_class(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2417,8 +2417,8 @@ test_fs_sect_extend(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2773,8 +2773,8 @@ test_fs_sect_iterate(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ diff --git a/test/gen_bounds.c b/test/gen_bounds.c index d6e415d..609b3dd 100644 --- a/test/gen_bounds.c +++ b/test/gen_bounds.c @@ -64,8 +64,8 @@ gen_earliest_latest(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -208,8 +208,8 @@ gen_earliest_v18(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -326,8 +326,8 @@ gen_latest_latest(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -435,8 +435,8 @@ gen_v18_latest(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -550,8 +550,8 @@ gen_v18_v18(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; diff --git a/test/gen_deflate.c b/test/gen_deflate.c index d11ed09..734c2b8 100644 --- a/test/gen_deflate.c +++ b/test/gen_deflate.c @@ -51,7 +51,7 @@ main(void) hsize_t dims[SPACE_RANK] = {SPACE_DIM1, SPACE_DIM2}; hsize_t chunk_dims[SPACE_RANK] = {CHUNK_DIM1, CHUNK_DIM2}; size_t i, j; /* Local index variables */ - int * data = NULL; /* Dataset data */ + int *data = NULL; /* Dataset data */ /* Initialize the data */ /* (Try for something easily compressible) */ diff --git a/test/gen_file_image.c b/test/gen_file_image.c index b5e07da..b39e449 100644 --- a/test/gen_file_image.c +++ b/test/gen_file_image.c @@ -43,7 +43,7 @@ main(void) hid_t fid = -1, sid = -1, did = -1; hsize_t dims[SPACE_RANK] = {SPACE_DIM1, SPACE_DIM2}; size_t i, j; /* Local index variables */ - int * data = NULL; /* Dataset data */ + int *data = NULL; /* Dataset data */ /* Initialize the data */ if (NULL == (data = (int *)HDmalloc(SPACE_DIM1 * SPACE_DIM2 * sizeof(int)))) diff --git a/test/gen_plist.c b/test/gen_plist.c index e9db752..8e5e0f1 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -45,7 +45,7 @@ main(void) double w0 = 0.5; unsigned max_compact; unsigned min_dense; - const char * c_to_f = "x+32"; + const char *c_to_f = "x+32"; int little_endian; int word_length; H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, @@ -84,7 +84,7 @@ main(void) /* check endianess */ { short int word = 0x0001; - char * byte = (char *)&word; + char *byte = (char *)&word; if (byte[0] == 1) /* little endian */ @@ -448,7 +448,7 @@ encode_plist(hid_t plist_id, int little_endian, int word_length, const char *fil { int fd = 0; /* file descriptor */ herr_t ret = 0; - void * temp_buf = NULL; + void *temp_buf = NULL; size_t temp_size = 0; ssize_t H5_ATTR_NDEBUG_UNUSED write_size; char filename[1024]; diff --git a/test/genall5.c b/test/genall5.c index 31627de..948e3f9 100644 --- a/test/genall5.c +++ b/test/genall5.c @@ -567,7 +567,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) HDassert(root_oinfo.addr == lnk_info.u.address); } /* end else-if */ else { - void * elinkval; + void *elinkval; const char *file = NULL; const char *path = NULL; @@ -967,7 +967,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) HDassert(root_oinfo.addr == lnk_info.u.address); } /* end else-if */ else { - void * elinkval; + void *elinkval; const char *file = NULL; const char *path = NULL; @@ -1591,7 +1591,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) void ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * wdata = NULL; + int *wdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -1686,7 +1686,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) void vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * rdata = NULL; + int *rdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -1905,7 +1905,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) void ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * wdata = NULL; + int *wdata = NULL; unsigned u; hid_t dsid = -1; hid_t dcpl = -1; @@ -2030,7 +2030,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) void vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * rdata = NULL; + int *rdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -2264,7 +2264,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) void ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * wdata = NULL; + int *wdata = NULL; unsigned u; hid_t dsid = -1; hid_t dcpl = -1; @@ -2390,7 +2390,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) void vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * rdata = NULL; + int *rdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -2609,7 +2609,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) hid_t tid = -1; hsize_t dims[1] = {DSET_SMALL_DIMS}; herr_t ret; - hvl_t * wdata = NULL; + hvl_t *wdata = NULL; unsigned u; if (pass) { @@ -2654,7 +2654,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { for (u = 0; u < DSET_SMALL_DIMS; u++) { - int * tdata; + int *tdata; unsigned len; unsigned v; @@ -2761,7 +2761,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) int ndims; hsize_t dims[1], max_dims[1]; htri_t type_equal; - hvl_t * rdata = NULL; + hvl_t *rdata = NULL; unsigned u; herr_t ret; diff --git a/test/gheap.c b/test/gheap.c index 779b331..71b3bd1 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -68,7 +68,7 @@ static int test_1(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; uint8_t in[GHEAP_TEST_NOBJS]; @@ -177,7 +177,7 @@ static int test_2(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; uint8_t in[GHEAP_TEST_NOBJS]; @@ -277,7 +277,7 @@ static int test_3(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; size_t u; @@ -368,7 +368,7 @@ static int test_4(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; size_t u; @@ -465,9 +465,9 @@ static int test_ooo_indices(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; unsigned i, j; - H5HG_t * obj = NULL; + H5HG_t *obj = NULL; herr_t status; int nerrors = 0; char filename[1024]; diff --git a/test/h5test.c b/test/h5test.c index 9169f29..cdd9da8 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -115,7 +115,7 @@ const char *LIBVER_NAMES[] = {"earliest", /* H5F_LIBVER_EARLIEST = 0 */ static H5E_auto2_t err_func = NULL; static herr_t h5_errors(hid_t estack, void *client_data); -static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix, char *fullname, +static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix, char *fullname, size_t size, hbool_t nest_printf); /*------------------------------------------------------------------------- @@ -539,7 +539,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu hbool_t nest_printf) { const char *prefix = NULL; - char * ptr, last = '\0'; + char *ptr, last = '\0'; const char *suffix = _suffix; size_t i, j; hid_t driver = -1; @@ -849,7 +849,7 @@ h5_get_vfd_fapl(hid_t fapl) { const char *env = NULL; /* HDF5_DRIVER environment variable */ const char *tok = NULL; /* strtok pointer */ - char * lasts = NULL; /* Context pointer for strtok_r() call */ + char *lasts = NULL; /* Context pointer for strtok_r() call */ char buf[1024]; /* buffer for tokenizing HDF5_DRIVER */ /* Get the environment variable, if it exists */ @@ -907,7 +907,7 @@ h5_get_vfd_fapl(hid_t fapl) H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl[H5FD_MEM_NTYPES]; const char *memb_name[H5FD_MEM_NTYPES]; - char * sv[H5FD_MEM_NTYPES]; + char *sv[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; H5FD_mem_t mt; @@ -1104,7 +1104,7 @@ h5_set_info_object(void) do { size_t len; - char * key_val, *endp, *namep; + char *key_val, *endp, *namep; if (*valp == ';') valp++; @@ -1506,7 +1506,7 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name) { int fd_old = (-1), fd_new = (-1); /* File descriptors for copying data */ ssize_t nread; /* Number of bytes read in */ - void * buf = NULL; /* Buffer for copying data */ + void *buf = NULL; /* Buffer for copying data */ const char *filename = H5_get_srcdir_filename(origfilename); /* Get the test file name to copy */ if (!filename) @@ -1715,7 +1715,7 @@ h5_send_message(const char *send, const char *arg1, const char *arg2) herr_t h5_wait_message(const char *waitfor) { - FILE * returnfile; + FILE *returnfile; time_t t0, t1; /* Start timer. If this function runs for too long (i.e., @@ -2048,12 +2048,12 @@ H5_get_srcdir(void) int h5_duplicate_file_by_bytes(const char *orig, const char *dest) { - FILE * orig_ptr = NULL; - FILE * dest_ptr = NULL; + FILE *orig_ptr = NULL; + FILE *dest_ptr = NULL; hsize_t fsize = 0; hsize_t read_size = 0; hsize_t max_buf = 0; - void * dup_buf = NULL; + void *dup_buf = NULL; int ret_value = 0; max_buf = 4096 * sizeof(char); diff --git a/test/h5test.h b/test/h5test.h index 7800fc2..1a78008 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -246,9 +246,9 @@ extern "C" { /* Generally useful testing routines */ H5TEST_DLL void h5_clean_files(const char *base_name[], hid_t fapl); H5TEST_DLL int h5_cleanup(const char *base_name[], hid_t fapl); -H5TEST_DLL char * h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size); -H5TEST_DLL char * h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size); -H5TEST_DLL char * h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size); +H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size); +H5TEST_DLL char *h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size); +H5TEST_DLL char *h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size); H5TEST_DLL hid_t h5_fileaccess(void); H5TEST_DLL hid_t h5_fileaccess_flags(unsigned flags); H5TEST_DLL void h5_no_hwconv(void); @@ -260,11 +260,11 @@ H5TEST_DLL h5_stat_size_t h5_get_file_size(const char *filename, hid_t fapl); H5TEST_DLL int print_func(const char *format, ...); H5TEST_DLL int h5_make_local_copy(const char *origfilename, const char *local_copy_name); H5TEST_DLL herr_t h5_verify_cached_stabs(const char *base_name[], hid_t fapl); -H5TEST_DLL H5FD_class_t *h5_get_dummy_vfd_class(void); -H5TEST_DLL const char * h5_get_version_string(H5F_libver_t libver); -H5TEST_DLL int h5_compare_file_bytes(char *fname1, char *fname2); -H5TEST_DLL int h5_duplicate_file_by_bytes(const char *orig, const char *dest); -H5TEST_DLL herr_t h5_check_if_file_locking_enabled(hbool_t *are_enabled); +H5TEST_DLL H5FD_class_t *h5_get_dummy_vfd_class(void); +H5TEST_DLL const char *h5_get_version_string(H5F_libver_t libver); +H5TEST_DLL int h5_compare_file_bytes(char *fname1, char *fname2); +H5TEST_DLL int h5_duplicate_file_by_bytes(const char *orig, const char *dest); +H5TEST_DLL herr_t h5_check_if_file_locking_enabled(hbool_t *are_enabled); /* Functions that will replace components of a FAPL */ H5TEST_DLL herr_t h5_get_vfd_fapl(hid_t fapl_id); diff --git a/test/hdfs.c b/test/hdfs.c index dfaa585..f1c33c4 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -428,7 +428,7 @@ test_fapl_config_validation(void) *************************/ struct testcase { - const char * msg; + const char *msg; herr_t expected; H5FD_hdfs_fapl_t config; }; diff --git a/test/hyperslab.c b/test/hyperslab.c index 1c55259..0e6ad36 100644 --- a/test/hyperslab.c +++ b/test/hyperslab.c @@ -299,8 +299,8 @@ static herr_t test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size_t ddx, size_t ddy, size_t ddz) { - uint8_t * src = NULL; /*source array */ - uint8_t * dst = NULL; /*destination array */ + uint8_t *src = NULL; /*source array */ + uint8_t *dst = NULL; /*destination array */ hsize_t hs_size[3]; /*hyperslab size */ hsize_t dst_size[3]; /*destination total size */ hsize_t src_size[3]; /*source total size */ @@ -764,8 +764,8 @@ error: static herr_t test_transpose(size_t nx, size_t ny) { - int * src = NULL; - int * dst = NULL; + int *src = NULL; + int *dst = NULL; hsize_t src_stride[2], dst_stride[2]; hsize_t size[2]; char s[256]; @@ -1009,7 +1009,7 @@ error: static herr_t test_array_fill(size_t lo, size_t hi) { - int * dst = NULL; /* Destination */ + int *dst = NULL; /* Destination */ int src[ARRAY_FILL_SIZE]; /* Source to duplicate */ size_t u, v, w; /* Local index variables */ char s[256]; diff --git a/test/lheap.c b/test/lheap.c index 6c99835..f9ba6f9 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -49,10 +49,10 @@ main(void) { hid_t fapl = H5P_DEFAULT; /* file access properties */ hid_t file = -1; /* hdf5 file */ - H5F_t * f = NULL; /* hdf5 file pointer */ + H5F_t *f = NULL; /* hdf5 file pointer */ char filename[1024]; /* file name */ haddr_t heap_addr; /* local heap address */ - H5HL_t * heap = NULL; /* local heap */ + H5HL_t *heap = NULL; /* local heap */ size_t obj[NOBJS]; /* offsets within the heap */ int i, j; /* miscellaneous counters */ char buf[1024]; /* the value to store */ diff --git a/test/links.c b/test/links.c index 77a2c49..e6e385e 100644 --- a/test/links.c +++ b/test/links.c @@ -160,7 +160,7 @@ typedef struct { int stop; /* # of iterations to stop after */ int64_t curr; /* Current creation order value */ size_t max_visit; /* Size of "visited link" flag array */ - hbool_t * visited; /* Pointer to array of "visited link" flags */ + hbool_t *visited; /* Pointer to array of "visited link" flags */ } link_iter_info_t; /* Link visit structs */ @@ -828,7 +828,7 @@ long_links(hid_t fapl, hbool_t new_format) hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ hid_t gid2 = -1; /* Datatype ID */ - char * objname = NULL; /* Name of object [Long] */ + char *objname = NULL; /* Name of object [Long] */ size_t u; /* Local index variable */ char filename[NAME_BUF_SIZE]; @@ -4232,13 +4232,13 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) hid_t did = H5I_INVALID_HID; hid_t dapl_id = H5I_INVALID_HID; hid_t dcpl = H5I_INVALID_HID; - char * filename1 = NULL; - char * filename2 = NULL; - char * tmpname = NULL; - char * cwdpath = NULL; + char *filename1 = NULL; + char *filename2 = NULL; + char *tmpname = NULL; + char *cwdpath = NULL; hsize_t dims[2]; - int ** points = NULL; - int * points_data = NULL; + int **points = NULL; + int *points_data = NULL; int i, j, n; h5_stat_size_t filesize; h5_stat_size_t new_filesize; @@ -4905,8 +4905,8 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format) base_driver == H5FD_MPIO || base_driver == H5FD_CORE) ? H5P_DEFAULT : fapl; - op_data.fam_size = ELINK_CB_FAM_SIZE; - op_data.code = 0; + op_data.fam_size = ELINK_CB_FAM_SIZE; + op_data.code = 0; /* Create family fapl */ if ((fam_fapl = H5Pcopy(fapl)) < 0) @@ -7448,17 +7448,17 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hid_t group3 = H5I_INVALID_HID; hid_t group4 = H5I_INVALID_HID; hid_t group5 = H5I_INVALID_HID; - char * filename1 = NULL; - char * filename2a = NULL; - char * filename2b = NULL; - char * filename3a = NULL; - char * filename3b = NULL; - char * filename4a = NULL; - char * filename4b = NULL; - char * filename5a = NULL; - char * filename5b = NULL; - char * tmpname = NULL; - char * cwdpath = NULL; + char *filename1 = NULL; + char *filename2a = NULL; + char *filename2b = NULL; + char *filename3a = NULL; + char *filename3b = NULL; + char *filename4a = NULL; + char *filename4b = NULL; + char *filename5a = NULL; + char *filename5b = NULL; + char *tmpname = NULL; + char *cwdpath = NULL; hbool_t have_posix_compat_vfd; /* Whether VFD used is compatible w/POSIX I/O calls */ #endif /* H5_HAVE_SYMLINK */ @@ -14471,7 +14471,7 @@ link_iterate(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_iter_info_t iter_info; /* Iterator info */ - hbool_t * visited = NULL; /* Array of flags for visiting links */ + hbool_t *visited = NULL; /* Array of flags for visiting links */ hsize_t skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ @@ -14974,7 +14974,7 @@ link_iterate_old(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_iter_info_t iter_info; /* Iterator info */ - hbool_t * visited = NULL; /* Array of flags for visiting links */ + hbool_t *visited = NULL; /* Array of flags for visiting links */ hsize_t skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ @@ -15218,7 +15218,7 @@ open_by_idx(hid_t fapl) char filename[NAME_BUF_SIZE]; /* File name */ char objname[NAME_BUF_SIZE]; /* Object name */ char valname[2 * NAME_BUF_SIZE]; /* Link value */ - haddr_t * objno = NULL; /* Addresses of the objects created */ + haddr_t *objno = NULL; /* Addresses of the objects created */ unsigned u; /* Local index variable */ hid_t ret; /* Generic return value */ @@ -15717,7 +15717,7 @@ object_info(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char valname[2 * NAME_BUF_SIZE]; /* Link value */ char attrname[NAME_BUF_SIZE]; /* Attribute name */ - haddr_t * objno = NULL; /* Addresses of the objects created */ + haddr_t *objno = NULL; /* Addresses of the objects created */ herr_t ret; /* Generic return value */ unsigned u, v; /* Local index variables */ @@ -216,7 +216,7 @@ test_mf_eoa(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; haddr_t addr1, addr2; @@ -364,7 +364,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size = 0, new_file_size; /* file size */ H5FD_mem_t type; haddr_t addr = 0; @@ -650,7 +650,7 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* File size */ H5FD_mem_t type; haddr_t addr; @@ -874,7 +874,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) if (HDstrcmp(env_h5_drvr, "split") != 0 && HDstrcmp(env_h5_drvr, "multi") != 0 && HDstrcmp(env_h5_drvr, "family") != 0) { char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ haddr_t maxaddr; /* File's max. address */ haddr_t tmp_addr; /* Temporary space file address */ @@ -1058,7 +1058,7 @@ test_mf_fs_start(hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FS_stat_t state; @@ -1169,7 +1169,7 @@ test_mf_fs_alloc_free(hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5MF_free_section_t *sect_node = NULL; haddr_t addr; @@ -1498,7 +1498,7 @@ test_mf_fs_extend(hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5MF_free_section_t *sect_node1 = NULL, *sect_node2 = NULL; haddr_t addr; @@ -2005,7 +2005,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr, saddr; haddr_t tmp; haddr_t ma_addr = HADDR_UNDEF; @@ -2180,7 +2180,7 @@ test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t fcpl; /* File creation property list */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; @@ -2332,7 +2332,7 @@ test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; haddr_t addr1, addr2, addr3; @@ -2488,7 +2488,7 @@ test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, addr4, saddr1; @@ -2658,7 +2658,7 @@ test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* File size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, saddr1, saddr2, saddr3; @@ -2807,7 +2807,7 @@ test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* File size */ H5FD_mem_t type; haddr_t addr1, addr2, addr3; @@ -2944,7 +2944,7 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1; @@ -3118,7 +3118,7 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size, file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1, saddr2, saddr3; @@ -3289,7 +3289,7 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size = 0, file_size; H5FD_mem_t type, stype; haddr_t new_addr, addr, saddr; @@ -3586,7 +3586,7 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size = 0, file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1; @@ -3837,7 +3837,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) hid_t file = -1; /* File ID */ hid_t fapl1 = -1; char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; H5FD_mem_t type; haddr_t addr1, addr2; @@ -4128,7 +4128,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ h5_stat_size_t file_size; - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5MF_free_section_t *sect_node = NULL; haddr_t addr; H5FS_stat_t state; @@ -4487,7 +4487,7 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; /* File size */ H5FD_mem_t type; @@ -4750,7 +4750,7 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; /* File size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1; @@ -5094,7 +5094,7 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3; @@ -5408,7 +5408,7 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type; haddr_t addr1, addr2, addr3; @@ -5625,7 +5625,7 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, saddr1; @@ -5895,7 +5895,7 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2; @@ -6105,7 +6105,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t copied_fapl = -1; /* FAPL to use for this test */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type; haddr_t addr1, addr2; hsize_t block_size; @@ -6157,7 +6157,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) else { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; - char * memb_name[H5FD_MEM_NTYPES]; + char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; H5FD_mem_t mt; @@ -6279,7 +6279,7 @@ test_mf_fs_persist_split(void) hid_t fcpl = -1; /* File creation property list ID */ hid_t fapl = -1; /* File access property list ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type, stype, btype; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ haddr_t addr1, addr2, addr3, addr4; /* File address for H5FD_MEM_SUPER */ @@ -6594,7 +6594,7 @@ test_mf_fs_persist_multi(void) hid_t fcpl = -1; /* File creation property list ID */ hid_t fapl = -1; /* File access property list ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type, stype, btype, gtype; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ haddr_t addr1, addr2, addr3, addr4; /* File allocation type */ @@ -6607,7 +6607,7 @@ test_mf_fs_persist_multi(void) H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; /* Memory usage map */ hid_t memb_fapl[H5FD_MEM_NTYPES]; /* Member access properties */ char sv[H5FD_MEM_NTYPES][64]; /* Name generators */ - const char * memb_name[H5FD_MEM_NTYPES]; /* Name generators */ + const char *memb_name[H5FD_MEM_NTYPES]; /* Name generators */ haddr_t memb_addr[H5FD_MEM_NTYPES]; /* Member starting address */ TESTING("File's free-space managers are persistent for multi-file"); @@ -6916,7 +6916,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hid_t fcpl = -1; /* File creation property list ID */ hid_t fapl2 = -1; /* File access property list ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type; /* File allocation type */ H5FD_mem_t tt; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ @@ -7099,7 +7099,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hid_t fcpl = -1; /* File creation property list */ hid_t fapl2 = -1; /* File access property list */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ haddr_t addr1, addr2, addr3, addr4; /* File address for H5FD_MEM_SUPER */ @@ -7300,7 +7300,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for hid_t fcpl = -1; /* File creation property list template */ hid_t fapl2 = -1; /* File access property list template */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type; /* File allocation type */ H5FD_mem_t tt; /* File allocation type */ haddr_t addr1, addr2, addr3, addr4, addr5, addr6; /* File address for H5FD_MEM_SUPER */ @@ -7469,7 +7469,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format hid_t fcpl = -1; /* File creation property list template */ hid_t fapl2 = -1; /* File access property list template */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type; /* File allocation type */ H5FD_mem_t tt; /* File allocation type */ haddr_t addr1, addr2, addr3, addr4, addr5, addr6; /* File address for H5FD_MEM_SUPER */ @@ -7672,7 +7672,7 @@ test_dichotomy(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type, stype; haddr_t addr1, addr3, saddr1, saddr2; @@ -7748,7 +7748,7 @@ 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]; - char * memb_name[H5FD_MEM_NTYPES]; + char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; H5FD_mem_t mt; @@ -7807,7 +7807,7 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ hid_t fapl_new = -1; /* File access property list ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr2, addr3; /* Addresses for small metadata blocks */ haddr_t saddr1; /* Addresses for small raw data blocks */ haddr_t gaddr1; /* Addresses for large data blocks */ @@ -8041,7 +8041,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr1; /* Address for small metadata block */ haddr_t saddr1; /* Address for small raw data block */ haddr_t gaddr1; /* Address for large data block */ @@ -8172,7 +8172,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr1, addr2, addr3; /* Addresses for small metadata blocks */ haddr_t saddr1; /* Address for small raw data block */ hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ @@ -8352,7 +8352,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for large data blocks */ hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ htri_t was_extended; /* Whether the block can be extended or not */ @@ -8515,7 +8515,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for blocks */ hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ H5FS_stat_t fs_stat; /* Information for free-space manager */ @@ -8669,7 +8669,7 @@ test_page_small(const char *env_h5_drvr, hid_t fapl) { hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr2, addr3, addr4, addr5; /* Addresses for blocks */ haddr_t addr9, addr10, addr11; /* Address for small metadata blocks */ haddr_t saddr1, saddr2; /* Addresses for small raw data blocks */ @@ -8844,7 +8844,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) hid_t fcpl = -1; /* File creation property list ID */ hid_t fcpl2 = -1; /* File creation property list ID */ hid_t fapl_new = -1; /* File access property list ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr1, addr2; /* Addresses for small metadata blocks */ haddr_t saddr1, saddr2; /* Addresses for small raw data blocks */ haddr_t gaddr1, gaddr2; /* Addresses for blocks */ @@ -8884,7 +8884,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) hid_t memb_fapl; H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; - char * memb_name[H5FD_MEM_NTYPES]; + char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; H5FD_mem_t mt; diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index 34a4481..f1170f0 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -136,7 +136,7 @@ static void mybzero(void *dest, size_t size) { size_t i = 0; - char * s = NULL; + char *s = NULL; HDassert(dest != NULL); s = (char *)dest; for (i = 0; i < size; i++) { @@ -1919,7 +1919,7 @@ test_basic_dataset_write(const struct mt_opts *opts) hid_t dspace_id = H5I_INVALID_HID; hid_t dtype_id = H5T_NATIVE_INT; hsize_t dims[2] = {DATABUFFER_SIZE, DATABUFFER_SIZE}; - int * buf = NULL; + int *buf = NULL; int i = 0; int j = 0; @@ -2440,7 +2440,7 @@ test_concurrent_access(const struct mt_opts *opts) hid_t dspace_id = H5I_INVALID_HID; hid_t dtype_id = H5T_NATIVE_INT; hsize_t dims[2] = {DATABUFFER_SIZE, DATABUFFER_SIZE}; - int * buf = NULL; + int *buf = NULL; int i = 0; int j = 0; diff --git a/test/mtime.c b/test/mtime.c index fd5fc42..255ab5d 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -55,7 +55,7 @@ main(void) hid_t fapl, file, space, dset; hsize_t size[1] = {2}; time_t now; - struct tm * tm; + struct tm *tm; H5O_info_t oi1, oi2; signed char buf1[32], buf2[32]; char filename[1024]; diff --git a/test/ntypes.c b/test/ntypes.c index e63211f..3a45594 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -75,7 +75,7 @@ test_atomic_dtype(hid_t file) hid_t dtype = -1, native_type = -1; int i, j, n; hsize_t dims[2]; - void * tmp = NULL; + void *tmp = NULL; struct { int arr[DIM0][DIM1]; } *ipoints2 = NULL; @@ -338,9 +338,9 @@ test_compound_dtype2(hid_t file) nest_mem_id = -1; int i, j, n; hsize_t dims[2]; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL, *bkg = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL, *bkg = NULL; TESTING("nested compound datatype"); @@ -661,12 +661,12 @@ test_compound_dtype(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, mem_id = -1; int i, j, n; hsize_t dims[2]; - s1 * temp_point = NULL; - s1 * temp_check = NULL; - s1 * points = NULL; - s1 * check = NULL; - void * tmp = NULL; - void * bkg = NULL; + s1 *temp_point = NULL; + s1 *temp_check = NULL; + s1 *points = NULL; + s1 *check = NULL; + void *tmp = NULL; + void *bkg = NULL; TESTING("compound datatype"); @@ -876,9 +876,9 @@ test_compound_dtype3(hid_t file) hsize_t array_dims[1] = {5}; int i, j, k, n; hsize_t dims[2]; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL, *bkg = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL, *bkg = NULL; TESTING("compound datatype with array as field"); @@ -1115,9 +1115,9 @@ test_compound_opaque(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, mem_id = -1; int i, j, k, n; hsize_t dims[2]; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL, *bkg = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL, *bkg = NULL; TESTING("compound datatype with opaque field"); @@ -1337,10 +1337,10 @@ test_enum_dtype(hid_t file) hid_t tid = -1, tid_m = -1, dtype = -1, native_type = -1; int i, j, n; hsize_t dims[2]; - void * tmp = NULL; + void *tmp = NULL; short colors[8]; unsigned char sub_colors[16]; - const char * mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; + const char *mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; struct { short arr[DIM0][DIM1]; } *spoints2 = NULL; @@ -1501,9 +1501,9 @@ test_array_dtype(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid3 = -1, tid_m = -1; int i, j, k, n; hsize_t space_dims[2], array_dims[1] = {5}; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL; TESTING("array of compound datatype"); @@ -1684,7 +1684,7 @@ test_array_dtype2(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid_m = -1; int i, j, k, n; hsize_t space_dims[2], array_dims[1] = {5}; - void * tmp = NULL; + void *tmp = NULL; struct { int arr[DIM0][DIM1][5]; } *ipoints3 = NULL; @@ -1834,12 +1834,12 @@ test_vl_dtype(hid_t file) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hsize_t dims1[] = {SPACE1_DIM1}; hid_t dataset = -1, space = -1; hid_t dtype = -1, native_type = -1, nat_super_type = -1, tid = -1, tid2 = -1, tid_m = -1, tid_m2 = -1; size_t i, j, k; - void ** tmp = NULL; + void **tmp = NULL; TESTING("variable length datatype"); @@ -2044,7 +2044,7 @@ test_vlstr_dtype(hid_t file) "conceived in liberty and dedicated to the proposition that all men are created equal.", "Now we are engaged in a great civil war,", "testing whether that nation or any nation so conceived and so dedicated can long endure."}; - char * rdata[SPACE1_DIM1]; /* Information read in */ + char *rdata[SPACE1_DIM1]; /* Information read in */ hbool_t rdata_alloc = FALSE; /* Whether the read data is allocated */ hid_t dataset = -1; /* Dataset ID */ hid_t sid1 = -1; /* Dataspace ID */ @@ -2487,7 +2487,7 @@ test_refer_dtype2(hid_t file) rbuf; /* buffer read from disk */ uint8_t *dwbuf = NULL, /* Buffer for writing numeric data to disk */ *drbuf = NULL; /* Buffer for reading numeric data from disk */ - uint8_t * tu8 = NULL; /* Temporary pointer to uint8 data */ + uint8_t *tu8 = NULL; /* Temporary pointer to uint8 data */ H5O_type_t obj_type; /* Object type */ int i; /* counting variables */ @@ -2794,7 +2794,7 @@ test_bitfield_dtype(hid_t file) size_t ntype_size, i; unsigned char wbuf[BITFIELD_ENUMB * sizeof(int)]; unsigned char *p = NULL; - void * rbuf = NULL; + void *rbuf = NULL; unsigned int intw[BITFIELD_ENUMB], intr[BITFIELD_ENUMB]; hsize_t nelmts; diff --git a/test/objcopy.c b/test/objcopy.c index 2743ccd..9b055b6 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -783,8 +783,8 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ H5A_info_t ainfo; /* Attribute info */ H5A_info_t ainfo2; /* Attribute info */ hssize_t nelmts; /* # of elements in dataspace */ - void * rbuf = NULL; /* Buffer for reading raw data */ - void * rbuf2 = NULL; /* Buffer for reading raw data */ + void *rbuf = NULL; /* Buffer for reading raw data */ + void *rbuf2 = NULL; /* Buffer for reading raw data */ /* Check the character sets are equal */ if (H5Aget_info(aid, &ainfo) < 0) @@ -1342,8 +1342,8 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) htri_t is_committed2; /* If the datatype is committed */ int nfilters; /* Number of filters applied to dataset */ hssize_t nelmts; /* # of elements in dataspace */ - void * rbuf = NULL; /* Buffer for reading raw data */ - void * rbuf2 = NULL; /* Buffer for reading raw data */ + void *rbuf = NULL; /* Buffer for reading raw data */ + void *rbuf2 = NULL; /* Buffer for reading raw data */ H5D_space_status_t space_status; /* Dataset's raw dataspace status */ H5D_space_status_t space_status2; /* Dataset's raw dataspace status */ @@ -2428,7 +2428,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) H5F_libver_t low, high; /* File format bounds */ unsigned srcdset_layoutversion; /* Layout version of source dataset */ int i, j; /* Local index variables */ - H5D_t * dsetp = NULL; /* Pointer to internal dset structure */ + H5D_t *dsetp = NULL; /* Pointer to internal dset structure */ herr_t ret; /* Generic return value */ TESTING("H5Ocopy(): simple dataset with version bounds"); @@ -5956,7 +5956,7 @@ test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fa else /* open the group for copy */ if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR /* open the destination group */ if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) @@ -10179,7 +10179,7 @@ test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; @@ -10375,7 +10375,7 @@ test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; @@ -10574,7 +10574,7 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; @@ -10813,7 +10813,7 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; diff --git a/test/ohdr.c b/test/ohdr.c index f685d55..bf24298 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -65,12 +65,12 @@ static herr_t test_cont(char *filename, hid_t fapl) { hid_t file = -1; - H5F_t * f = NULL; + H5F_t *f = NULL; H5O_hdr_info_t hdr_info; H5O_loc_t oh_locA, oh_locB; time_t time_new; - const char * short_name = "T"; - const char * long_name = "This is the message"; + const char *short_name = "T"; + const char *long_name = "This is the message"; size_t nchunks; TESTING("object header continuation block"); @@ -180,8 +180,8 @@ test_ohdr_cache(char *filename, hid_t fapl) hid_t file = -1; /* File ID */ hid_t my_fapl; /* FAPL ID */ H5AC_cache_config_t mdc_config; /* Metadata cache configuration info */ - H5F_t * f = NULL; /* File handle */ - H5HL_t * lheap, *lheap2, *lheap3; /* Pointer to local heaps */ + H5F_t *f = NULL; /* File handle */ + H5HL_t *lheap, *lheap2, *lheap3; /* Pointer to local heaps */ haddr_t lheap_addr, lheap_addr2, lheap_addr3; /* Local heap addresses */ H5O_loc_t oh_loc; /* Object header location */ time_t time_new; /* Time value for modification time message */ @@ -320,7 +320,7 @@ test_ohdr_swmr(hbool_t new_format) hid_t sid = -1; /* Dataspace ID */ hid_t plist = -1; /* Dataset creation property list */ size_t compact_size = 1024; /* The size of compact dataset */ - int * wbuf = NULL; /* Buffer for writing */ + int *wbuf = NULL; /* Buffer for writing */ hsize_t dims[1]; /* Dimension sizes */ size_t u; /* Iterator */ int n; /* Data variable */ @@ -900,8 +900,8 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id) hid_t sid = H5I_INVALID_HID; hid_t did = H5I_INVALID_HID; hid_t aid = H5I_INVALID_HID; - char * in_buf = NULL; - char * out_buf = NULL; + char *in_buf = NULL; + char *out_buf = NULL; size_t buf_size = 0; int out_val = 0; int in_val = 0; @@ -1799,8 +1799,8 @@ main(void) { hid_t fapl = -1; hid_t file = -1; - H5F_t * f = NULL; - const char * env_h5_drvr; /* File driver value from environment */ + H5F_t *f = NULL; + const char *env_h5_drvr; /* File driver value from environment */ hbool_t single_file_vfd; /* Whether VFD used stores data in a single file */ char filename[1024]; H5O_hdr_info_t hdr_info; /* Object info */ diff --git a/test/page_buffer.c b/test/page_buffer.c index 7f2748d..874aea7 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -90,7 +90,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl) hid_t grp_id = -1; hid_t filespace = -1; hsize_t dimsf[2] = {NX, NY}; /* dataset dimensions */ - int * data = NULL; /* pointer to data buffer to write */ + int *data = NULL; /* pointer to data buffer to write */ hid_t dcpl = -1; int i; int num_elements; @@ -228,7 +228,7 @@ open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size hid_t file_id = -1; hid_t dset_id = -1; hid_t grp_id = -1; - int * data = NULL; /* pointer to data buffer to write */ + int *data = NULL; /* pointer to data buffer to write */ int i; int j; int num_elements; @@ -311,7 +311,7 @@ set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize) hbool_t multi = FALSE; H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; - char * memb_name[H5FD_MEM_NTYPES]; + char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; H5FD_mem_t mt; @@ -580,8 +580,8 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) size_t page_count = 0; int i, num_elements = 2000; haddr_t addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("Raw Data Handling"); @@ -860,8 +860,8 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) int num_elements = 2000; haddr_t addr = HADDR_UNDEF; haddr_t search_addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("LRU Processing"); @@ -1117,8 +1117,8 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) H5PB_t *page_buf; haddr_t meta_addr = HADDR_UNDEF; haddr_t raw_addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("Minimum Metadata threshold Processing"); HDprintf("\n"); @@ -1749,8 +1749,8 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) size_t base_meta_cnt = 0; haddr_t meta_addr = HADDR_UNDEF; haddr_t raw_addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("Statistics Collection"); diff --git a/test/pool.c b/test/pool.c index c508025..7cb6895 100644 --- a/test/pool.c +++ b/test/pool.c @@ -166,7 +166,7 @@ test_allocate_first(void) H5MP_pool_t *mp; /* Memory pool */ H5MP_page_t *page; /* Memory pool page */ size_t free_size; /* Free size in pool */ - void * spc; /* Pointer to space allocated */ + void *spc; /* Pointer to space allocated */ /* * Test memory pool allocation @@ -321,8 +321,8 @@ test_allocate_split(void) { H5MP_pool_t *mp; /* Memory pool */ size_t free_size; /* Free size in pool */ - void * spc1; /* Pointer to space allocated */ - void * spc2; /* Pointer to space allocated */ + void *spc1; /* Pointer to space allocated */ + void *spc2; /* Pointer to space allocated */ /* * Test memory pool allocation @@ -431,7 +431,7 @@ test_allocate_many_small(void) { H5MP_pool_t *mp; /* Memory pool */ size_t free_size; /* Free size in pool */ - void * spc[MPOOL_NUM_SMALL_BLOCKS]; /* Pointers to space allocated */ + void *spc[MPOOL_NUM_SMALL_BLOCKS]; /* Pointers to space allocated */ int i; /* Local index variable */ /* @@ -515,9 +515,9 @@ test_allocate_new_page(void) H5MP_pool_t *mp; /* Memory pool */ size_t free_size; /* Free size in pool */ size_t u; /* Local index variable */ - void * spc[MPOOL_NUM_NORMAL_BLOCKS]; /* Pointer to space allocated */ - void * spc1; /* Pointer to space allocated */ - void * spc2; /* Pointer to space allocated */ + void *spc[MPOOL_NUM_NORMAL_BLOCKS]; /* Pointer to space allocated */ + void *spc1; /* Pointer to space allocated */ + void *spc2; /* Pointer to space allocated */ /* * Test memory pool allocation @@ -648,10 +648,10 @@ test_allocate_random(void) H5MP_pool_t *mp; /* Memory pool */ size_t u; /* Local index variable */ time_t curr_time; /* Current time, for seeding random number generator */ - size_t * blk_size = NULL; /* Pointer to block sizes */ - void ** spc = NULL; /* Pointer to space allocated */ + size_t *blk_size = NULL; /* Pointer to block sizes */ + void **spc = NULL; /* Pointer to space allocated */ size_t swap_idx; /* Location to swap with when shuffling */ - void * swap_ptr; /* Pointer to swap when shuffling */ + void *swap_ptr; /* Pointer to swap when shuffling */ /* * Test memory pool allocation diff --git a/test/ros3.c b/test/ros3.c index 11a6451..c852016 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -430,7 +430,7 @@ test_fapl_config_validation(void) *************************/ struct testcase { - const char * msg; + const char *msg; herr_t expected; H5FD_ros3_fapl_t config; }; @@ -818,7 +818,7 @@ test_vfd_open(void) 0, }, }; - H5FD_t * fd = NULL; + H5FD_t *fd = NULL; hbool_t curl_ready = FALSE; hid_t fapl_id = -1; hid_t fapl_file_access = -1; @@ -1076,7 +1076,7 @@ test_H5FDread_without_eoa_set_fails(void) { char buffer[256]; unsigned int i = 0; - H5FD_t * file_shakespeare = NULL; + H5FD_t *file_shakespeare = NULL; hid_t fapl_id = -1; TESTING("ROS3 VFD read-eoa temporal coupling library limitation "); @@ -1250,7 +1250,7 @@ test_read(void) herr_t open_return = FAIL; char buffer[S3_TEST_MAX_URL_SIZE]; unsigned int i = 0; - H5FD_t * file_raven = NULL; + H5FD_t *file_raven = NULL; hid_t fapl_id = -1; TESTING("ROS3 VFD read/range-gets"); @@ -1394,7 +1394,7 @@ test_noops_and_autofails(void) hbool_t curl_ready = FALSE; hid_t fapl_id = -1; - H5FD_t * file = NULL; + H5FD_t *file = NULL; const char data[36] = "The Force shall be with you, always"; TESTING("ROS3 VFD always-fail and no-op routines"); diff --git a/test/s3comms.c b/test/s3comms.c index 2723921..1cc47b7 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -447,10 +447,10 @@ test_aws_canonical_request(void) }; struct testcase { - const char * exp_request; - const char * exp_headers; - const char * verb; - const char * resource; + const char *exp_request; + const char *exp_headers; + const char *verb; + const char *resource; unsigned int listsize; struct header list[5]; }; @@ -500,10 +500,10 @@ test_aws_canonical_request(void) }; /* struct testcase cases[] */ struct testcase *C = NULL; char cr_dest[512]; /* canonical request */ - hrb_t * hrb = NULL; /* http request buffer object */ + hrb_t *hrb = NULL; /* http request buffer object */ unsigned int i = 0; /* looping/indexing */ unsigned int j = 0; /* looping/indexing */ - hrb_node_t * node = NULL; /* http headers list pointer */ + hrb_node_t *node = NULL; /* http headers list pointer */ unsigned int n_cases = 3; char sh_dest[64]; /* signed headers */ @@ -753,7 +753,7 @@ test_hrb_init_request(void) struct testcase *C = NULL; unsigned int i = 0; unsigned int ncases = 5; - hrb_t * req = NULL; + hrb_t *req = NULL; TESTING("hrb_init_request"); @@ -1123,7 +1123,7 @@ test_hrb_node_set(void) for (test_i = 0; test_i < testcases_count; test_i++) { const hrb_node_t *node = NULL; - const testcase * test = &(cases[test_i]); + const testcase *test = &(cases[test_i]); unsigned mock_i = 0; /********* @@ -1208,9 +1208,9 @@ test_HMAC_SHA256(void) herr_t ret; /* SUCCEED/FAIL expected from call */ const unsigned char key[SHA256_DIGEST_LENGTH]; size_t key_len; - const char * msg; + const char *msg; size_t msg_len; - const char * exp; /* not used if ret == FAIL */ + const char *exp; /* not used if ret == FAIL */ size_t dest_size; /* if 0, `dest` is not malloc'd */ }; @@ -1406,14 +1406,14 @@ test_parse_url(void) herr_t exp_ret; /* expected return; */ /* if FAIL, `expected` is unused */ const_purl_t expected; - const char * msg; + const char *msg; }; /************************ * test-local variables * ************************/ - parsed_url_t * purl = NULL; + parsed_url_t *purl = NULL; unsigned int i = 0; unsigned int ncases = 15; struct testcase cases[] = { @@ -1818,9 +1818,9 @@ test_s3r_open(void) char url_raven_badport[S3_TEST_MAX_URL_SIZE]; char url_shakespeare[S3_TEST_MAX_URL_SIZE]; unsigned char signing_key[SHA256_DIGEST_LENGTH]; - struct tm * now = NULL; + struct tm *now = NULL; char iso8601now[ISO8601_SIZE]; - s3r_t * handle = NULL; + s3r_t *handle = NULL; hbool_t curl_ready = FALSE; parsed_url_t *purl = NULL; @@ -2021,7 +2021,7 @@ test_s3r_read(void) char url_raven[S3_TEST_MAX_URL_SIZE]; char buffer[S3COMMS_TEST_BUFFER_SIZE]; - s3r_t * handle = NULL; + s3r_t *handle = NULL; hbool_t curl_ready = FALSE; unsigned int i = 0; @@ -2182,9 +2182,9 @@ test_signing_key(void) *************************/ struct testcase { - const char * region; - const char * secret_key; - const char * when; + const char *region; + const char *secret_key; + const char *when; unsigned char exp[SHA256_DIGEST_LENGTH]; }; @@ -2286,11 +2286,11 @@ test_tostringtosign(void) * test-local variables * ************************/ - const char canonreq[] = "GET\n/" - "test.txt\n\nhost:examplebucket.s3.amazonaws.com\nrange:bytes=0-9\nx-amz-content-" - "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\nx-amz-" - "date:20130524T000000Z\n\nhost;range;x-amz-content-sha256;x-amz-" - "date\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; + const char canonreq[] = "GET\n/" + "test.txt\n\nhost:examplebucket.s3.amazonaws.com\nrange:bytes=0-9\nx-amz-content-" + "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\nx-amz-" + "date:20130524T000000Z\n\nhost;range;x-amz-content-sha256;x-amz-" + "date\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; const char iso8601now[] = "20130524T000000Z"; const char region[] = "us-east-1"; char s2s[512]; @@ -2386,7 +2386,7 @@ test_trim(void) size_t dest_len = 0; int i = 0; int n_cases = 5; - char * str = NULL; + char *str = NULL; TESTING("s3comms trim"); @@ -2496,7 +2496,7 @@ test_uriencode(void) "", }}; - char * dest = NULL; + char *dest = NULL; size_t dest_written = 0; int i = 0; int ncases = 6; diff --git a/test/set_extent.c b/test/set_extent.c index 65e56a0..dca41c1 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -178,7 +178,7 @@ main(void) /* Set the "use the earliest version of the format" bounds for * creating objects in the file */ if (H5Pset_libver_bounds(my_fapl, H5F_LIBVER_EARLIEST, H5F_LIBVER_LATEST) < 0) - TEST_ERROR + TEST_ERROR /* Tests which use chunked datasets */ if (!new_format || (new_format && contig_addr_vfd)) @@ -2242,7 +2242,7 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_ hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum dimensions */ hsize_t old_dims[4]; /* Old dataset dimensions */ hsize_t min_unwritten_dims[4]; /* Minimum dimensions since last write */ - hsize_t * valid_dims = old_dims; /* Dimensions of region still containing written data */ + hsize_t *valid_dims = old_dims; /* Dimensions of region still containing written data */ hsize_t cdims[4]; /* Chunk dimensions */ const hsize_t mdims[4] = {10, 10, 10, 10}; /* Memory buffer dimensions */ const hsize_t start[4] = {0, 0, 0, 0}; /* Start for hyperslabe operations on memory */ @@ -2291,8 +2291,9 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_ /* Generate initial dataset size, 1-10, unless using fixed array index or * scalar_iter is 0 */ for (i = 0; i < 4; i++) { - dims[i] = (hsize_t)( - index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); + dims[i] = + (hsize_t)(index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) + : 10); dim_log->arr[0][i] = dims[i]; } /* end for */ @@ -2462,7 +2463,7 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum dimensions */ hsize_t old_dims[4]; /* Old dataset dimensions */ hsize_t min_unwritten_dims[4]; /* Minimum dimensions since last write */ - hsize_t * valid_dims = old_dims; /* Dimensions of region still containing written data */ + hsize_t *valid_dims = old_dims; /* Dimensions of region still containing written data */ hsize_t cdims[4]; /* Chunk dimensions */ const hsize_t mdims[4] = {10, 10, 10, 10}; /* Memory buffer dimensions */ const hsize_t start[4] = {0, 0, 0, 0}; /* Start for hyperslab operations on memory */ @@ -2540,8 +2541,9 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab /* Generate initial dataset size, 1-10, unless using fixed array index or * scalar_iter is 0 */ for (i = 0; i < 4; i++) { - dims[i] = (hsize_t)( - index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); + dims[i] = + (hsize_t)(index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) + : 10); dim_log->arr[0][i] = dims[i]; } diff --git a/test/stab.c b/test/stab.c index 2ac0b1c..50c3a3f 100644 --- a/test/stab.c +++ b/test/stab.c @@ -200,7 +200,7 @@ test_long(hid_t fcpl, hid_t fapl, hbool_t new_format) { hid_t fid = (-1); /* File ID */ hid_t g1 = (-1), g2 = (-1); - char * name1 = NULL, *name2 = NULL; + char *name1 = NULL, *name2 = NULL; char filename[NAME_BUF_SIZE]; size_t i; @@ -648,7 +648,7 @@ long_compact(hid_t fcpl, hid_t fapl2) hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group ID */ hid_t gid2 = (-1); /* Group ID */ - char * objname = NULL; /* Object name */ + char *objname = NULL; /* Object name */ char filename[NAME_BUF_SIZE]; h5_stat_size_t empty_size; /* Size of an empty file */ h5_stat_size_t file_size; /* Size of each file created */ diff --git a/test/swmr.c b/test/swmr.c index eafd424..473dda8 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -851,7 +851,7 @@ test_metadata_read_retry_info(hid_t in_fapl) hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fid1 = H5I_INVALID_HID; /* File ID */ H5F_retry_info_t info, info1; /* The collection of metadata retries */ - H5F_t * f = NULL, *f1 = NULL; /* Internal file object pointers */ + H5F_t *f = NULL, *f1 = NULL; /* Internal file object pointers */ unsigned i, j, n; /* Local index variables */ hid_t did1 = H5I_INVALID_HID; /* Dataset ID */ hid_t did2 = H5I_INVALID_HID; /* Dataset ID */ @@ -3219,7 +3219,7 @@ test_object_flush_cb(hid_t in_fapl) hsize_t dims[2] = {5, 10}; /* Dataset dimension sizes */ int buf[50]; /* Data buffer */ H5F_flush_cb_t ret_cb; /* The callback function set in object flush property */ - void * ret_ct; /* The user data set in object flush property */ + void *ret_ct; /* The user data set in object flush property */ unsigned flush_ct = 0; /* The user data for object flush property */ char filename[NAME_BUF_SIZE]; /* File name */ int i; /* Local index variable */ @@ -3493,7 +3493,7 @@ test_append_flush_generic(void) unsigned count = 0; /* The user data for append flush property */ hsize_t ret_boundary[3]; /* The boundary set in append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in append flush property */ - unsigned * ret_count; /* The user data set in append flush property */ + unsigned *ret_count; /* The user data set in append flush property */ herr_t ret; /* The return value */ TESTING("H5Fget/set_append_flush() for a generic dataset access property list"); @@ -3676,7 +3676,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) hsize_t ret_boundary[3]; /* Boundary size set in the append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in the append flush property */ - unsigned * ret_count; /* The user data set in the append flush property */ + unsigned *ret_count; /* The user data set in the append flush property */ char filename[NAME_BUF_SIZE]; /* file name */ @@ -3898,7 +3898,7 @@ test_append_flush_dataset_fixed(hid_t in_fapl) hsize_t ret_boundary[3]; /* Boundary size set in the append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in the append flush property */ - unsigned * ret_count; /* The user data set in the append flush property */ + unsigned *ret_count; /* The user data set in the append flush property */ char filename[NAME_BUF_SIZE]; /* file name */ @@ -4120,7 +4120,7 @@ test_append_flush_dataset_multiple(hid_t in_fapl) hsize_t ret_boundary[3]; /* Boundary size set in the append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in the append flush property */ - unsigned * ret_count; /* The user data set in the append flush property */ + unsigned *ret_count; /* The user data set in the append flush property */ char filename[NAME_BUF_SIZE]; /* file name */ @@ -7360,8 +7360,8 @@ main(void) { int nerrors = 0; /* The # of errors */ hid_t fapl = -1; /* File access property list ID */ - char * driver = NULL; /* VFD string (from env variable) */ - char * lock_env_var = NULL; /* file locking env var pointer */ + char *driver = NULL; /* VFD string (from env variable) */ + char *lock_env_var = NULL; /* file locking env var pointer */ hbool_t use_file_locking; /* read from env var */ hbool_t file_locking_enabled = FALSE; /* Checks if the file system supports locks */ diff --git a/test/swmr_common.h b/test/swmr_common.h index d0d829d..eb6bd41 100644 --- a/test/swmr_common.h +++ b/test/swmr_common.h @@ -40,7 +40,7 @@ /* Information about a symbol/dataset */ typedef struct { - char * name; /* Dataset name for symbol */ + char *name; /* Dataset name for symbol */ hid_t dsid; /* Dataset ID for symbol */ hsize_t nrecords; /* Number of records for the symbol */ } symbol_info_t; diff --git a/test/swmr_reader.c b/test/swmr_reader.c index e849f67..0566613 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -394,7 +394,7 @@ main(int argc, char *argv[]) int ncommon = 5; /* # of common symbols to poll */ int nrandom = 10; /* # of random symbols to poll */ hbool_t verbose = TRUE; /* Whether to emit some informational messages */ - FILE * verbose_file = NULL; /* File handle for verbose output */ + FILE *verbose_file = NULL; /* File handle for verbose output */ hbool_t use_seed = FALSE; /* Set to 1 if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ unsigned u; /* Local index variables */ diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index 3e84dcc..38d6aa4 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -358,7 +358,7 @@ main(int argc, char *argv[]) long nrecords = 0; /* # of records to append */ long flush_count = 10000; /* # of records to write between flushing file */ hbool_t verbose = TRUE; /* Whether to emit some informational messages */ - FILE * verbose_file = NULL; /* File handle for verbose output */ + FILE *verbose_file = NULL; /* File handle for verbose output */ hbool_t use_seed = FALSE; /* Set to TRUE if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ int comp_level = -1; /* Compression level (-1 is no compression) */ diff --git a/test/swmr_writer.c b/test/swmr_writer.c index c4178f0..c8fe716 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -281,7 +281,7 @@ main(int argc, char *argv[]) long nrecords = 0; /* # of records to append */ long flush_count = 10000; /* # of records to write between flushing file */ hbool_t verbose = TRUE; /* Whether to emit some informational messages */ - FILE * verbose_file = NULL; /* File handle for verbose output */ + FILE *verbose_file = NULL; /* File handle for verbose output */ hbool_t old = FALSE; /* Whether to use non-latest-format when opening file */ hbool_t use_seed = FALSE; /* Set to TRUE if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ diff --git a/test/tarray.c b/test/tarray.c index 61db84c..3b9abfc 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -54,7 +54,7 @@ /* Struct used with test_array_bkg() test */ typedef struct { int nsubfields; - char * name[NMAX]; + char *name[NMAX]; size_t offset[NMAX]; hid_t datatype[NMAX]; @@ -579,7 +579,7 @@ test_array_compound_atomic(void) int ndims; /* Array rank for reading */ hsize_t rdims1[H5S_MAX_RANK]; /* Array dimensions for reading */ int nmemb; /* Number of compound members */ - char * mname; /* Name of compound field */ + char *mname; /* Name of compound field */ size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ int i, j; /* counting variables */ @@ -791,7 +791,7 @@ test_array_compound_array(void) int ndims; /* Array rank for reading */ hsize_t rdims1[H5S_MAX_RANK]; /* Array dimensions for reading */ int nmemb; /* Number of compound members */ - char * mname; /* Name of compound field */ + char *mname; /* Name of compound field */ size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ H5T_class_t mclass; /* Datatype class for field */ @@ -1046,7 +1046,7 @@ test_array_compound_array(void) void * test_array_alloc_custom(size_t size, void *info) { - void * ret_value = NULL; /* Pointer to return */ + void *ret_value = NULL; /* Pointer to return */ size_t *mem_used = (size_t *)info; /* Pointer to the memory used */ size_t extra; /* Extra space needed */ @@ -1082,7 +1082,7 @@ void test_array_free_custom(void *_mem, void *info) { unsigned char *mem = NULL; /* Pointer to mem to be freed */ - size_t * mem_used = (size_t *)info; /* Pointer to the memory used */ + size_t *mem_used = (size_t *)info; /* Pointer to the memory used */ size_t extra; /* Extra space needed */ /* @@ -1915,7 +1915,7 @@ test_compat(void) hsize_t rdims1[H5S_MAX_RANK]; /* Array dimensions for reading */ H5T_class_t mclass; /* Datatype class for VL */ int nmemb; /* Number of compound members */ - char * mname; /* Name of compound field */ + char *mname; /* Name of compound field */ size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ int i; /* Index variables */ diff --git a/test/tattr.c b/test/tattr.c index a2eed24..d8a8068 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -153,7 +153,7 @@ typedef struct { int stop; /* # of iterations to stop after */ hsize_t curr; /* Current creation order value */ size_t max_visit; /* Size of "visited attribute" flag array */ - hbool_t * visited; /* Pointer to array of "visited attribute" flags */ + hbool_t *visited; /* Pointer to array of "visited attribute" flags */ } attr_iter_info_t; static herr_t attr_op1(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data); @@ -180,7 +180,7 @@ test_attr_basic_write(hid_t fapl) hid_t attr, attr2; /* Attribute ID */ hsize_t attr_size; /* storage size for attribute */ ssize_t attr_name_size; /* size of attribute name */ - char * attr_name = NULL; /* name of attribute */ + char *attr_name = NULL; /* name of attribute */ hsize_t dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3}; hsize_t dims2[] = {ATTR1_DIM1}; hsize_t dims3[] = {ATTR2_DIM1, ATTR2_DIM2}; @@ -795,7 +795,7 @@ test_attr_compound_read(hid_t fapl) H5T_order_t order; /* Attribute datatype order */ size_t size; /* Attribute datatype size as stored in file */ int fields; /* # of Attribute datatype fields */ - char * fieldname; /* Name of a field */ + char *fieldname; /* Name of a field */ size_t offset; /* Attribute datatype field offset */ hid_t field; /* Attribute field datatype */ struct attr4_struct read_data4[ATTR4_DIM1][ATTR4_DIM2]; /* Buffer for reading 4th attribute */ @@ -1419,7 +1419,7 @@ test_attr_mult_read(hid_t fapl) static herr_t attr_op1(hid_t H5_ATTR_UNUSED loc_id, const char *name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *op_data) { - int * count = (int *)op_data; + int *count = (int *)op_data; herr_t ret = 0; switch (*count) { @@ -6938,10 +6938,10 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) H5_index_t idx_type; /* Type of index to operate on */ H5_iter_order_t order; /* Order within in the index */ attr_iter_info_t iter_info; /* Iterator info */ - hbool_t * visited = NULL; /* Array of flags for visiting links */ + hbool_t *visited = NULL; /* Array of flags for visiting links */ hsize_t idx; /* Start index for iteration */ unsigned use_index; /* Use index on creation order values */ - const char * dsetname; /* Name of dataset for attributes */ + const char *dsetname; /* Name of dataset for attributes */ char attrname[NAME_BUF_SIZE]; /* Name of attribute */ unsigned curr_dset; /* Current dataset to work on */ unsigned u; /* Local index variable */ @@ -8173,7 +8173,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) htri_t is_shared; /* Is attributes shared? */ hsize_t shared_refcount; /* Reference count of shared attribute */ unsigned attr_value; /* Attribute value */ - unsigned * big_value; /* Data for "big" attribute */ + unsigned *big_value; /* Data for "big" attribute */ size_t mesg_count; /* # of shared messages */ unsigned test_shared; /* Index over shared component type */ unsigned u; /* Local index variable */ @@ -8508,7 +8508,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) htri_t is_shared; /* Is attributes shared? */ hsize_t shared_refcount; /* Reference count of shared attribute */ unsigned attr_value; /* Attribute value */ - unsigned * big_value; /* Data for "big" attribute */ + unsigned *big_value; /* Data for "big" attribute */ size_t mesg_count; /* # of shared messages */ unsigned test_shared; /* Index over shared component type */ unsigned u; /* Local index variable */ @@ -8953,7 +8953,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) htri_t is_shared; /* Is attributes shared? */ hsize_t shared_refcount; /* Reference count of shared attribute */ unsigned attr_value; /* Attribute value */ - unsigned * big_value; /* Data for "big" attribute */ + unsigned *big_value; /* Data for "big" attribute */ size_t mesg_count; /* # of shared messages */ unsigned test_shared; /* Index over shared component type */ unsigned u; /* Local index variable */ @@ -9323,7 +9323,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) htri_t is_shared; /* Is attributes shared? */ hsize_t shared_refcount; /* Reference count of shared attribute */ unsigned attr_value; /* Attribute value */ - unsigned * big_value; /* Data for "big" attribute */ + unsigned *big_value; /* Data for "big" attribute */ size_t mesg_count; /* # of shared messages */ unsigned test_shared; /* Index over shared component type */ unsigned u; /* Local index variable */ diff --git a/test/testframe.c b/test/testframe.c index 2e02ae6..ef7f78a 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -639,7 +639,7 @@ SetTest(const char *testname, int action) void TestAlarmOn(void) { - char * env_val = HDgetenv("HDF5_ALARM_SECONDS"); /* Alarm environment */ + char *env_val = HDgetenv("HDF5_ALARM_SECONDS"); /* Alarm environment */ unsigned long alarm_sec = H5_ALARM_SEC; /* Number of seconds before alarm goes off */ /* Get the alarm value from the environment variable, if set */ diff --git a/test/tfile.c b/test/tfile.c index 6620fed..ee8ca02 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1084,7 +1084,7 @@ test_get_obj_ids(void) hid_t filespace; hsize_t file_dims[F2_RANK] = {F2_DIM0, F2_DIM1}; ssize_t oid_count, ret_count; - hid_t * oid_list = NULL; + hid_t *oid_list = NULL; herr_t ret; int i, m, n; ssize_t oid_list_size = NDSETS; @@ -2188,7 +2188,7 @@ test_file_double_file_dataset_open(hbool_t new_format) const char *data[] = {"String 1", "String 2", "String 3", "String 4", "String 5"}; /* Input Data */ const char *e_data[] = {"String 1", "String 2", "String 3", "String 4", "String 5", "String 6", "String 7"}; /* Input Data */ - char * buffer[5]; /* Output buffer */ + char *buffer[5]; /* Output buffer */ int wbuf[4] = {1, 2, 3, 4}; /* Input data */ herr_t ret; /* Generic return value */ @@ -2730,7 +2730,7 @@ cal_chksum(const char *file, uint32_t *chksum) { int curr_num_errs = GetTestNumErrs(); /* Retrieve the current # of errors */ int fdes = -1; /* File descriptor */ - void * file_data = NULL; /* Copy of file data */ + void *file_data = NULL; /* Copy of file data */ ssize_t bytes_read; /* # of bytes read */ h5_stat_t sb; /* Stat buffer for file */ herr_t ret; /* Generic return value */ @@ -3956,7 +3956,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t multi, hbool_t split) { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; - char * memb_name[H5FD_MEM_NTYPES]; + char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; H5FD_mem_t mt; @@ -5471,7 +5471,7 @@ static void test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non_def_fsm) { hid_t fid = H5I_INVALID_HID; /* File ID */ - H5F_t * f = NULL; /* Internal file pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ hbool_t ok; /* The result is ok or not */ herr_t ret; /* The return value */ @@ -5635,7 +5635,7 @@ static void test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non_def_fsm) { hid_t fid = H5I_INVALID_HID; /* File ID */ - H5F_t * f = NULL; /* Internal file pointer */ + H5F_t *f = NULL; /* Internal file pointer */ hid_t new_fapl = H5I_INVALID_HID; /* File access property list */ unsigned super_vers; /* Superblock version */ H5F_libver_t low, high; /* Low and high bounds */ @@ -5793,7 +5793,7 @@ test_libver_bounds_obj(hid_t fapl) hid_t gid = H5I_INVALID_HID; /* Group ID */ hid_t fcpl = H5I_INVALID_HID; /* File creation property list */ hid_t new_fapl = H5I_INVALID_HID; /* File access property list */ - H5F_t * f = NULL; /* Internal file pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ H5O_info_t oinfo; /* Object info */ H5G_info_t ginfo; /* Group info */ @@ -5958,8 +5958,8 @@ test_libver_bounds_dataset(hid_t fapl) hid_t did = H5I_INVALID_HID; /* Dataset ID */ hid_t sid = H5I_INVALID_HID; /* Dataspace ID */ hid_t dcpl = H5I_INVALID_HID; /* Dataset creation property list */ - H5D_t * dset = NULL; /* Internal dataset pointer */ - H5F_t * f = NULL; /* Internal file pointer */ + H5D_t *dset = NULL; /* Internal dataset pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ herr_t ret; /* Return value */ hsize_t fix_dims2[2] = {10, 4}; /* Dimension sizes */ @@ -6196,8 +6196,8 @@ test_libver_bounds_dataspace(hid_t fapl) hid_t sid_compact = H5I_INVALID_HID, sid_contig = H5I_INVALID_HID; /* Dataspace IDs */ hid_t dcpl = H5I_INVALID_HID; /* Dataset creation property list */ hid_t dcpl_compact = H5I_INVALID_HID, dcpl_contig = H5I_INVALID_HID; /* Dataset creation property lists */ - H5S_t * space = NULL, *space_null = NULL; /* Internal dataspace pointers */ - H5F_t * f = NULL; /* Internal file pointer */ + H5S_t *space = NULL, *space_null = NULL; /* Internal dataspace pointers */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ hsize_t dims[1] = {1}; /* Dimension sizes */ hsize_t dims2[2] = {5, 4}; /* Dimension sizes */ @@ -6537,9 +6537,9 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid) hsize_t dims2[2] = {5, 4}; /* Dimension sizes */ hsize_t max_dims2[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes */ hsize_t chunks[2] = {2, 3}; /* Chunk dimension sizes */ - H5T_t * dtype = NULL; /* Internal datatype pointer */ - H5T_t * str_dtype = NULL; /* Internal datatype pointer for the string datatype */ - H5F_t * f = NULL; /* Internal file pointer */ + H5T_t *dtype = NULL; /* Internal datatype pointer */ + H5T_t *str_dtype = NULL; /* Internal datatype pointer for the string datatype */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ herr_t ret; /* Return value */ @@ -6774,8 +6774,8 @@ test_libver_bounds_attributes(hid_t fapl) hid_t sid = H5I_INVALID_HID; /* Dataspace ID */ hid_t aid = H5I_INVALID_HID; /* Attribute ID */ hid_t attr_cpl = H5I_INVALID_HID; /* Attribute creation property list */ - H5A_t * attr = NULL; /* Internal attribute pointer */ - H5F_t * f = NULL; /* Internal file pointer */ + H5A_t *attr = NULL; /* Internal attribute pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ herr_t ret; /* Return value */ diff --git a/test/tgenprop.c b/test/tgenprop.c index 55e5a9b..719b928 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -82,7 +82,7 @@ test_genprop_basic_class(void) hid_t cid1; /* Generic Property class ID */ hid_t cid2; /* Generic Property class ID */ hid_t cid3; /* Generic Property class ID */ - char * name; /* Name of class */ + char *name; /* Name of class */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1780,7 +1780,7 @@ test_genprop_path(void) hid_t cid1; /* Generic Property class ID */ hid_t cid2; /* Generic Property class ID */ hid_t cid3; /* Generic Property class ID */ - char * path; /* Class path */ + char *path; /* Class path */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1853,7 +1853,7 @@ test_genprop_refcount(void) { hid_t cid1; /* Generic Property class ID */ hid_t lid1; /* Generic Property class ID */ - char * name; /* Name of class */ + char *name; /* Name of class */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ diff --git a/test/th5o.c b/test/th5o.c index b6fe794..f1790d0 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -784,8 +784,8 @@ test_h5o_link(void) hsize_t dims[2] = {TEST6_DIM1, TEST6_DIM2}; htri_t committed; /* Whether the named datatype is committed */ H5F_libver_t low, high; /* File format bounds */ - int * wdata; - int * rdata; + int *wdata; + int *rdata; int i, n; herr_t ret; /* Value returned from API calls */ diff --git a/test/th5s.c b/test/th5s.c index 9e4547b..9a9e3cb 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -1686,9 +1686,9 @@ test_h5s_chunk(void) hsize_t dims[2]; hsize_t csize[2]; double **chunk_data_dbl = NULL; - double * chunk_data_dbl_data = NULL; - float ** chunk_data_flt = NULL; - float * chunk_data_flt_data = NULL; + double *chunk_data_dbl_data = NULL; + float **chunk_data_flt = NULL; + float *chunk_data_flt_data = NULL; int i, j; /* Allocate memory */ @@ -2477,7 +2477,7 @@ test_versionbounds(void) hid_t dset_space = -1; /* Retrieved dataset's dataspace ID */ hsize_t dim[1]; /* Dataset dimensions */ H5F_libver_t low, high; /* File format bounds */ - H5S_t * spacep = NULL; /* Pointer to internal dataspace */ + H5S_t *spacep = NULL; /* Pointer to internal dataspace */ herr_t ret = 0; /* Generic return value */ /* Output message about test being performed */ diff --git a/test/theap.c b/test/theap.c index 9d5787b..506ce8c 100644 --- a/test/theap.c +++ b/test/theap.c @@ -154,7 +154,7 @@ test_heap_create(void) static void test_heap_insert_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -228,7 +228,7 @@ test_heap_insert_min(void) static void test_heap_insert_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -395,10 +395,10 @@ test_heap_insert_many(void) static void test_heap_remove_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ - void * ptr; /* Pointer for object on heap */ + void *ptr; /* Pointer for object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ herr_t ret; /* Generic return value */ @@ -469,10 +469,10 @@ test_heap_remove_min(void) static void test_heap_remove_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ - void * ptr; /* Pointer for object on heap */ + void *ptr; /* Pointer for object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ herr_t ret; /* Generic return value */ @@ -560,7 +560,7 @@ test_heap_remove(void) static void test_heap_remove_many_core(H5HP_type_t heap_type, test_obj *arr, size_t nelem) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int last_val; /* Last value from the heap */ int val; /* Value of object on heap */ @@ -710,7 +710,7 @@ test_heap_remove_many(void) static void test_heap_change_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -784,7 +784,7 @@ test_heap_change_min(void) static void test_heap_change_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -876,7 +876,7 @@ test_heap_change(void) static void test_heap_incdec_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -951,7 +951,7 @@ test_heap_incdec_min(void) static void test_heap_incdec_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -32,8 +32,8 @@ basic_id_test(void) { H5I_type_t myType = H5I_BADID; hid_t arrayID = H5I_INVALID_HID; - void * testObj = NULL; - void * testPtr = NULL; + void *testObj = NULL; + void *testPtr = NULL; char nameString[10]; hid_t testID; ssize_t testSize = -1; @@ -254,10 +254,10 @@ test_search_func(void H5_ATTR_UNUSED *ptr1, hid_t H5_ATTR_UNUSED id, void H5_ATT static int id_predefined_test(void) { - void * testObj; + void *testObj; hid_t testID; hid_t typeID = H5I_INVALID_HID; - void * testPtr; + void *testPtr; herr_t testErr; testObj = HDmalloc(sizeof(int)); @@ -691,7 +691,7 @@ test_remove_clear_type(void) { H5I_type_t obj_type; rct_obj_list_t obj_list; - rct_obj_t * objects = NULL; /* Convenience pointer to objects stored in master list */ + rct_obj_t *objects = NULL; /* Convenience pointer to objects stored in master list */ size_t list_size; long i, j; herr_t ret; /* return value */ diff --git a/test/timer.c b/test/timer.c index 11b7427..ea9787a 100644 --- a/test/timer.c +++ b/test/timer.c @@ -126,7 +126,7 @@ static herr_t test_timer_system_user(void) { int i; - char * buf = NULL; + char *buf = NULL; H5_timer_t timer; H5_timevals_t times; herr_t err; @@ -194,7 +194,7 @@ static herr_t test_timer_elapsed(void) { int i; - char * buf = NULL; + char *buf = NULL; H5_timer_t timer; H5_timevals_t times; herr_t err; @@ -238,7 +238,7 @@ static herr_t test_timer_functionality(void) { int i; - char * buf = NULL; + char *buf = NULL; H5_timer_t timer; H5_timevals_t times; diff --git a/test/titerate.c b/test/titerate.c index d6edcbc..46d18ab 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -130,7 +130,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) int i; /* counting variable */ hsize_t idx; /* Index in the group */ char name[NAMELEN]; /* temporary name buffer */ - char * lnames[NDATASETS + 2]; /* Names of the links created */ + char *lnames[NDATASETS + 2]; /* Names of the links created */ char dataset_name[NAMELEN]; /* dataset name */ iter_info info; /* Custom iteration information */ H5G_info_t ginfo; /* Buffer for querying object's info */ @@ -418,7 +418,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) int i; /* counting variable */ hsize_t idx; /* Index in the attribute list */ char name[NAMELEN]; /* temporary name buffer */ - char * anames[NATTR]; /* Names of the attributes created */ + char *anames[NATTR]; /* Names of the attributes created */ iter_info info; /* Custom iteration information */ herr_t ret; /* Generic return value */ @@ -745,8 +745,8 @@ test_grp_memb_funcs(hid_t fapl) hid_t root_group, grp; /* Root group ID */ int i; /* counting variable */ char name[NAMELEN]; /* temporary name buffer */ - char * dnames[NDATASETS + 2]; /* Names of the datasets created */ - char * obj_names[NDATASETS + 2]; /* Names of the objects in group */ + char *dnames[NDATASETS + 2]; /* Names of the datasets created */ + char *obj_names[NDATASETS + 2]; /* Names of the objects in group */ char dataset_name[NAMELEN]; /* dataset name */ ssize_t name_len; /* Length of object's name */ H5G_info_t ginfo; /* Buffer for querying object's info */ @@ -1009,7 +1009,7 @@ test_corrupted_attnamelen(void) searched_err_t err_caught; /* Data to be passed to callback func */ int err_status; /* Status returned by H5Aiterate2 */ herr_t ret; /* Return value */ - const char * testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */ + const char *testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */ const char *err_message = "attribute name has different length than stored length"; /* the error message produced when the failure occurs */ diff --git a/test/tmisc.c b/test/tmisc.c index fbb3ca8..fdd1552 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -443,8 +443,8 @@ test_misc2_write_attribute(void) hid_t type; herr_t ret; misc2_struct data, data_check; - char * string_att1 = HDstrdup("string attribute in file one"); - char * string_att2 = HDstrdup("string attribute in file two"); + char *string_att1 = HDstrdup("string attribute in file one"); + char *string_att2 = HDstrdup("string attribute in file two"); type = misc2_create_type(); @@ -1248,8 +1248,8 @@ test_misc8(void) hsize_t dims[MISC8_RANK] = {MISC8_DIM0, MISC8_DIM1}; hsize_t chunk_dims[MISC8_RANK] = {MISC8_CHUNK_DIM0, MISC8_CHUNK_DIM1}; hsize_t storage_size; /* Number of bytes of raw data storage used */ - int * wdata; /* Data to write */ - int * tdata; /* Temporary pointer to data write */ + int *wdata; /* Data to write */ + int *tdata; /* Temporary pointer to data write */ #ifdef VERIFY_DATA int *rdata; /* Data to read */ int *tdata2; /* Temporary pointer to data to read */ @@ -2016,7 +2016,7 @@ test_misc12(void) "bien germina ya! Ceso la horrible noche, La libertad sublime", "derrama las auroras de su invencible luz.", "La humanidad entera, que entre cadenas gime, comprende", "las palabras del que murio en la cruz."}; - char * rdata[MISC12_SPACE1_DIM1 + MISC12_APPEND_SIZE]; /* Information read in */ + char *rdata[MISC12_SPACE1_DIM1 + MISC12_APPEND_SIZE]; /* Information read in */ hid_t fid1; hid_t dataset; hid_t sid1, space, memspace; @@ -2299,10 +2299,10 @@ misc13_create_hdf_file(const char *name, const unsigned *data) static void misc13_insert_user_block(const char *old_name, const char *new_name, const char *str, size_t size) { - FILE * new_fp = NULL; /* Pointers to new & old files */ - FILE * old_fp = NULL; - void * user_block = NULL; /* Pointer to user block to write to file */ - void * copy_buf = NULL; /* Pointer to buffer for copying data */ + FILE *new_fp = NULL; /* Pointers to new & old files */ + FILE *old_fp = NULL; + void *user_block = NULL; /* Pointer to user block to write to file */ + void *copy_buf = NULL; /* Pointer to buffer for copying data */ size_t written; /* Amount of data written to new file */ size_t read_in; /* Amount of data read in from old file */ int ret; /* Generic status value */ @@ -3745,7 +3745,7 @@ static void test_misc21(void) { hid_t fid, sid, dcpl, dsid; - char * buf; + char *buf; hsize_t dims[2] = {MISC21_SPACE_DIM0, MISC21_SPACE_DIM1}, chunk_size[2] = {MISC21_CHUNK_DIM0, MISC21_CHUNK_DIM1}; herr_t ret; /* Generic return value */ @@ -3811,7 +3811,7 @@ static void test_misc22(void) { hid_t fid, sid, dcpl, dsid, dcpl2; - char * buf; + char *buf; hsize_t dims[2] = {MISC22_SPACE_DIM0, MISC22_SPACE_DIM1}, chunk_size[2] = {MISC22_CHUNK_DIM0, MISC22_CHUNK_DIM1}; herr_t ret; /* Generic return value */ @@ -5543,8 +5543,8 @@ test_misc31(void) static void test_misc32(void) { - void * buffer; - void * resized; + void *buffer; + void *resized; size_t size; /* Output message about test being performed */ @@ -5663,8 +5663,8 @@ test_misc33(void) static void test_misc34(void) { - void * mem = NULL; /* allocated buffer */ - char * dup = NULL; /* 'duplicated' string */ + void *mem = NULL; /* allocated buffer */ + char *dup = NULL; /* 'duplicated' string */ size_t sz = 0; /* buffer size */ /* Output message about test being performed */ diff --git a/test/trefer.c b/test/trefer.c index 727e753..5b7a3cf 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -75,7 +75,7 @@ test_reference_params(void) hobj_ref_t *wbuf, /* buffer to write to disk */ *rbuf, /* buffer read from disk */ *tbuf; /* temp. buffer read from disk */ - unsigned * tu32; /* Temporary pointer to uint32 data */ + unsigned *tu32; /* Temporary pointer to uint32 data */ int i; /* Counters */ const char *write_comment = "Foo!"; /* Comments for group */ hid_t ret_id; /* Generic hid_t return value */ @@ -256,7 +256,7 @@ test_reference_obj(void) *rbuf, /* buffer read from disk */ *tbuf; /* temp. buffer read from disk */ hobj_ref_t nvrbuf[3] = {0, 101, 1000000000}; /* buffer with non-valid refs */ - unsigned * tu32; /* Temporary pointer to uint32 data */ + unsigned *tu32; /* Temporary pointer to uint32 data */ int i, j; /* Counters */ const char *write_comment = "Foo!"; /* Comments for group */ char read_comment[10]; @@ -521,15 +521,15 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) hsize_t count[SPACE2_RANK]; /* Element count of hyperslab */ hsize_t block[SPACE2_RANK]; /* Block size of hyperslab */ hsize_t coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */ - hsize_t * coords; /* Coordinate buffer */ + hsize_t *coords; /* Coordinate buffer */ hsize_t low[SPACE2_RANK]; /* Selection bounds */ hsize_t high[SPACE2_RANK]; /* Selection bounds */ hdset_reg_ref_t *wbuf, /* buffer to write to disk */ *rbuf; /* buffer read from disk */ hdset_reg_ref_t nvrbuf[3] = {{0}, {101}, {255}}; /* buffer with non-valid refs */ - uint8_t * dwbuf, /* Buffer for writing numeric data to disk */ + uint8_t *dwbuf, /* Buffer for writing numeric data to disk */ *drbuf; /* Buffer for reading numeric data from disk */ - uint8_t * tu8; /* Temporary pointer to uint8 data */ + uint8_t *tu8; /* Temporary pointer to uint8 data */ H5O_type_t obj_type; /* Type of object */ int i, j; /* counting variables */ hssize_t hssize_ret; /* hssize_t return value */ @@ -1029,14 +1029,14 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) hsize_t count[SPACE3_RANK]; /* Element count of hyperslab */ hsize_t block[SPACE3_RANK]; /* Block size of hyperslab */ hsize_t coord1[POINT1_NPOINTS][SPACE3_RANK]; /* Coordinates for point selection */ - hsize_t * coords; /* Coordinate buffer */ + hsize_t *coords; /* Coordinate buffer */ hsize_t low[SPACE3_RANK]; /* Selection bounds */ hsize_t high[SPACE3_RANK]; /* Selection bounds */ hdset_reg_ref_t *wbuf, /* buffer to write to disk */ *rbuf; /* buffer read from disk */ uint8_t *dwbuf, /* Buffer for writing numeric data to disk */ *drbuf; /* Buffer for reading numeric data from disk */ - uint8_t * tu8; /* Temporary pointer to uint8 data */ + uint8_t *tu8; /* Temporary pointer to uint8 data */ H5O_type_t obj_type; /* Object type */ int i; /* counting variables */ herr_t ret; /* Generic return value */ @@ -1416,7 +1416,7 @@ static herr_t test_deref_iter_op(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_UNUSED *info, void *op_data) { - int * count = (int *)op_data; /* Pointer to name counter */ + int *count = (int *)op_data; /* Pointer to name counter */ herr_t ret_value; /* Simple check for correct names */ diff --git a/test/trefstr.c b/test/trefstr.c index 0dcf621..dd4151f 100644 --- a/test/trefstr.c +++ b/test/trefstr.c @@ -291,7 +291,7 @@ static void test_refstr_own(void) { H5RS_str_t *rs; /* Ref-counted string created */ - char * s; /* Pointer to string to transfer */ + char *s; /* Pointer to string to transfer */ const char *t; /* Temporary pointers to string */ int cmp; /* Comparison value */ herr_t ret; /* Generic return value */ diff --git a/test/tselect.c b/test/tselect.c index 053ffaa..6a6a6cf 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -455,8 +455,8 @@ static herr_t test_select_point_iter1(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point, void *_operator_data) { - uint8_t * elem = (uint8_t *)_elem; /* Pointer to the element to examine */ - uint8_t * tmp; /* temporary ptr to element in operator data */ + uint8_t *elem = (uint8_t *)_elem; /* Pointer to the element to examine */ + uint8_t *tmp; /* temporary ptr to element in operator data */ struct pnt_iter *pnt_info = (struct pnt_iter *)_operator_data; tmp = pnt_info->buf + (pnt_info->coord[pnt_info->offset][0] * SPACE2_DIM2) + @@ -1958,10 +1958,10 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co hsize_t stride[SS_DR_MAX_RANK]; /* Shared hyperslab stride */ hsize_t count[SS_DR_MAX_RANK]; /* Shared hyperslab count */ hsize_t block[SS_DR_MAX_RANK]; /* Shared hyperslab block size */ - hsize_t * start_ptr; /* Actual hyperslab start offset */ - hsize_t * stride_ptr; /* Actual hyperslab stride */ - hsize_t * count_ptr; /* Actual hyperslab count */ - hsize_t * block_ptr; /* Actual hyperslab block size */ + hsize_t *start_ptr; /* Actual hyperslab start offset */ + hsize_t *stride_ptr; /* Actual hyperslab stride */ + hsize_t *count_ptr; /* Actual hyperslab count */ + hsize_t *block_ptr; /* Actual hyperslab block size */ size_t small_cube_size; /* Number of elements in small cube */ size_t large_cube_size; /* Number of elements in large cube */ unsigned u, v, w, x; /* Local index variables */ @@ -2811,7 +2811,7 @@ test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank hbool_t in_checker; hbool_t start_in_checker[5]; uint16_t expected_value; - uint16_t * val_ptr; + uint16_t *val_ptr; unsigned i, j, k, l, m; /* to track position in n-cube */ unsigned v, w, x, y, z; /* to track position in checker */ const unsigned test_max_rank = 5; /* code changes needed if this is increased */ @@ -2936,9 +2936,9 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ size_t start_index; /* Offset within buffer to begin inspecting */ size_t stop_index; /* Offset within buffer to end inspecting */ uint16_t expected_value; - uint16_t * small_cube_buf_1; - uint16_t * large_cube_buf_1; - uint16_t * ptr_1; + uint16_t *small_cube_buf_1; + uint16_t *large_cube_buf_1; + uint16_t *ptr_1; size_t small_cube_size; /* Number of elements in small cube */ size_t large_cube_size; /* Number of elements in large cube */ hsize_t dims[SS_DR_MAX_RANK]; @@ -6248,7 +6248,7 @@ test_select_hyper_union_random_5d(hid_t read_plist) hsize_t dims2[] = {SPACE6_DIM1}; hsize_t start[SPACE5_RANK]; /* Starting location of hyperslab */ hsize_t count[SPACE5_RANK]; /* Element count of hyperslab */ - int * wbuf, /* buffer to write to disk */ + int *wbuf, /* buffer to write to disk */ *rbuf, /* buffer read from disk */ *tbuf; /* temporary buffer pointer */ int i, j, k, l, m; /* Counters */ @@ -6390,8 +6390,8 @@ test_select_hyper_chunk(hid_t fapl_plist, hid_t xfer_plist) { hsize_t dimsf[3]; /* dataset dimensions */ hsize_t chunk_dimsf[3] = {CHUNK_X, CHUNK_Y, CHUNK_Z}; /* chunk sizes */ - short * data; /* data to write */ - short * tmpdata; /* data to write */ + short *data; /* data to write */ + short *tmpdata; /* data to write */ /* * Data and output buffer initialization. @@ -7349,7 +7349,7 @@ test_select_combine(void) typedef struct { unsigned short fill_value; /* The fill value to check */ size_t curr_coord; /* Current coordinate to examine */ - hsize_t * coords; /* Pointer to selection's coordinates */ + hsize_t *coords; /* Pointer to selection's coordinates */ } fill_iter_info; /**************************************************************** @@ -7361,7 +7361,7 @@ static herr_t test_select_hyper_iter3(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim, const hsize_t *point, void *_operator_data) { - unsigned * tbuf = (unsigned *)_elem; /* temporary buffer pointer */ + unsigned *tbuf = (unsigned *)_elem; /* temporary buffer pointer */ fill_iter_info *iter_info = (fill_iter_info *)_operator_data; /* Get the pointer to the iterator information */ hsize_t *coord_ptr; /* Pointer to the coordinate information for a point*/ @@ -7401,7 +7401,7 @@ test_select_fill_all(void) unsigned fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ hsize_t points[SPACE7_DIM1 * SPACE7_DIM2][SPACE7_RANK]; /* Coordinates of selection */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v; /* Counters */ herr_t ret; /* Generic return value */ @@ -7477,7 +7477,7 @@ test_select_fill_point(hssize_t *offset) size_t num_points = 5; /* Number of points selected */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v, w; /* Counters */ herr_t ret; /* Generic return value */ @@ -7577,7 +7577,7 @@ test_select_fill_hyper_simple(hssize_t *offset) hsize_t points[16][SPACE7_RANK]; /* Coordinates selected */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v; /* Counters */ herr_t ret; /* Generic return value */ @@ -7688,7 +7688,7 @@ test_select_fill_hyper_regular(hssize_t *offset) size_t num_points = 16; /* Number of points selected */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v, w; /* Counters */ herr_t ret; /* Generic return value */ @@ -7808,7 +7808,7 @@ test_select_fill_hyper_irregular(hssize_t *offset) size_t num_iter_points = 28; /* Number of resulting points */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v, w; /* Counters */ herr_t ret; /* Generic return value */ @@ -13496,8 +13496,8 @@ test_select_hyper_chunk_offset(void) const hsize_t mem_dims[1] = {SPACE10_DIM1}; /* Dataspace dimensions for memory */ const hsize_t dims[1] = {0}; /* Dataspace initial dimensions */ const hsize_t maxdims[1] = {H5S_UNLIMITED}; /* Dataspace mam dims */ - int * wbuf; /* Buffer for writing data */ - int * rbuf; /* Buffer for reading data */ + int *wbuf; /* Buffer for writing data */ + int *rbuf; /* Buffer for reading data */ hid_t dcpl; /* Dataset creation property list ID */ hsize_t chunks[1] = {SPACE10_CHUNK_SIZE}; /* Chunk size */ hsize_t start[1] = {0}; /* The start of the hyperslab */ diff --git a/test/tskiplist.c b/test/tskiplist.c index 4bf9b11..5430cb8 100644 --- a/test/tskiplist.c +++ b/test/tskiplist.c @@ -148,7 +148,7 @@ test_skiplist_insert(void) int key, /* Key of item to insert */ item; /* Item to insert */ int search_key; /* Key of item to search for in skip list */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ size_t num; /* Number of elements in skip list */ herr_t ret; /* Generic return value */ @@ -211,7 +211,7 @@ test_skiplist_insert_many(void) H5SL_t *slist; /* Skip list created */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -284,7 +284,7 @@ test_skiplist_remove(void) key2, /* Key of 2nd item to insert */ key3; /* Key of 3rd item to insert */ int search_key; /* Key of item to search for in skip list */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ size_t num; /* Number of elements in skip list */ herr_t ret; /* Generic return value */ @@ -364,7 +364,7 @@ test_skiplist_remove_many(void) H5SL_t *slist; /* Skip list created */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -462,11 +462,11 @@ test_skiplist_remove_many(void) static void test_skiplist_firstnext(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -528,7 +528,7 @@ test_skiplist_firstnext(void) static void test_skiplist_string(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ @@ -646,13 +646,13 @@ test_skiplist_iterate(void) static void test_skiplist_hsize(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ hsize_t data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; hsize_t sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - hsize_t * found_item; /* Item found in skip list */ + hsize_t *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -701,13 +701,13 @@ test_skiplist_hsize(void) static void test_skiplist_unsigned(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - unsigned * found_item; /* Item found in skip list */ + unsigned *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -756,7 +756,7 @@ test_skiplist_unsigned(void) static void test_skiplist_obj(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ @@ -764,7 +764,7 @@ test_skiplist_obj(void) {8, 12}, {31, 12}, {20, 11}, {31, 11}, {8, 32}}; H5_obj_t sorted_data[10] = {{8, 12}, {8, 32}, {10, 11}, {10, 12}, {10, 32}, {20, 11}, {20, 12}, {31, 11}, {31, 12}, {50, 1}}; - H5_obj_t * found_item; /* Item found in skip list */ + H5_obj_t *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -837,7 +837,7 @@ test_skiplist_generic_cmp(const void *_key1, const void *_key2) static void test_skiplist_generic(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ @@ -845,7 +845,7 @@ test_skiplist_generic(void) {30, 100}, {31, 38}, {32, 34}, {80, 32}, {90, 0}}; generic_t sorted_data[10] = {{30, 100}, {15, 32}, {31, 38}, {32, 34}, {5, 2}, {20, 13}, {10, 1}, {50, 37}, {80, 32}, {90, 0}}; - generic_t * found_item; /* Item found in skip list */ + generic_t *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -895,11 +895,11 @@ test_skiplist_generic(void) static void test_skiplist_lastprev(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -961,12 +961,12 @@ test_skiplist_lastprev(void) static void test_skiplist_find(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - unsigned * found_item; /* Item found in skip list */ + unsigned *found_item; /* Item found in skip list */ unsigned find_item; /* Item to find in skip list */ herr_t ret; /* Generic return value */ @@ -1017,12 +1017,12 @@ test_skiplist_find(void) static void test_skiplist_add(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - unsigned * found_item; /* Item found in skip list */ + unsigned *found_item; /* Item found in skip list */ unsigned new_item; /* Item to add to skip list */ herr_t ret; /* Generic return value */ @@ -1083,7 +1083,7 @@ test_skiplist_destroy_free(void *item, void H5_ATTR_UNUSED *key, void *op_data) static void test_skiplist_destroy(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned free_count; /* Number of items freed */ herr_t ret; /* Generic return value */ @@ -1118,7 +1118,7 @@ test_skiplist_destroy(void) static void test_skiplist_free(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ unsigned free_count; /* Number of items freed */ @@ -1176,7 +1176,7 @@ test_skiplist_free(void) /* Structure to hold the list of objects */ typedef struct { - H5SL_t * slist; /* Skiplist holding the objects */ + H5SL_t *slist; /* Skiplist holding the objects */ struct test_tfs_obj_t *list; /* Linear list of objects */ int nobjs; /* Number of objects in list */ int nobjs_rem; /* Number of objects in list that have not been freed */ @@ -1199,7 +1199,7 @@ typedef struct test_tfs_it_ud_t { static herr_t test_tfs_iter(void *_obj, void *key, void *_udata) { - test_tfs_obj_t * obj = (test_tfs_obj_t *)_obj; + test_tfs_obj_t *obj = (test_tfs_obj_t *)_obj; test_tfs_it_ud_t *udata = (test_tfs_it_ud_t *)_udata; /* Check consistency */ @@ -1222,11 +1222,11 @@ test_tfs_iter(void *_obj, void *key, void *_udata) static htri_t test_tfs_free(void *_obj, void *key, void *_obj_list) { - test_tfs_obj_t * obj = (test_tfs_obj_t *)_obj; + test_tfs_obj_t *obj = (test_tfs_obj_t *)_obj; test_tfs_list_t *obj_list = (test_tfs_list_t *)_obj_list; test_tfs_it_ud_t iter_ud; int nrems, rem_idx, i, j; - test_tfs_obj_t * obj_ret; + test_tfs_obj_t *obj_ret; herr_t ret; /* return value */ htri_t ret_value; @@ -1379,7 +1379,7 @@ test_skiplist_try_free_safe(void) static void test_skiplist_less(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; /* unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; */ @@ -1443,7 +1443,7 @@ test_skiplist_less(void) static void test_skiplist_greater(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; /* unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; */ @@ -1507,7 +1507,7 @@ test_skiplist_greater(void) static void test_skiplist_below(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; @@ -1586,7 +1586,7 @@ test_skiplist_below(void) static void test_skiplist_above(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; @@ -1665,7 +1665,7 @@ test_skiplist_above(void) static void test_skiplist_remove_first(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; @@ -1712,7 +1712,7 @@ test_skiplist_remove_first_many(void) { H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ int prev_item = INT_MIN; /* Previously found item in skip list */ herr_t ret; /* Generic return value */ diff --git a/test/tsohm.c b/test/tsohm.c index 29057b8..7ef283b 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -3689,7 +3689,7 @@ test_sohm_external_dtype(void) int a; int b; } s1_t; - s1_t * s_ptr, *orig; + s1_t *s_ptr, *orig; hid_t fcpl, file1, file2; hid_t dataset1, dataset2; hid_t s1_tid, dset1_tid, dset2_tid, space; diff --git a/test/ttsafe.c b/test/ttsafe.c index 067a715..a424a19 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -76,7 +76,7 @@ tts_is_threadsafe(void) char * gen_name(int value) { - char * temp; + char *temp; unsigned length; int i; diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c index c2c34a0..57108a3 100644 --- a/test/ttsafe_acreate.c +++ b/test/ttsafe_acreate.c @@ -144,8 +144,8 @@ void * tts_acreate_thread(void *client_data) { hid_t attribute = H5I_INVALID_HID; - char * attribute_name; - int * attribute_data; /* data for attributes */ + char *attribute_name; + int *attribute_data; /* data for attributes */ herr_t status; ttsafe_name_data_t *attrib_data; @@ -155,7 +155,7 @@ tts_acreate_thread(void *client_data) /* Create attribute */ attribute_name = gen_name(attrib_data->current_index); attribute = H5Acreate2(attrib_data->dataset, attribute_name, attrib_data->datatype, - attrib_data->dataspace, H5P_DEFAULT, H5P_DEFAULT); + attrib_data->dataspace, H5P_DEFAULT, H5P_DEFAULT); CHECK(attribute, H5I_INVALID_HID, "H5Acreate2"); /* Write data to the attribute */ diff --git a/test/ttsafe_attr_vlen.c b/test/ttsafe_attr_vlen.c index ecd0aa6..2fe140c 100644 --- a/test/ttsafe_attr_vlen.c +++ b/test/ttsafe_attr_vlen.c @@ -60,7 +60,7 @@ tts_attr_vlen(void) hid_t atid = H5I_INVALID_HID; /* Datatype ID for attribute */ hid_t asid = H5I_INVALID_HID; /* Dataspace ID for attribute */ hid_t aid = H5I_INVALID_HID; /* The attribute ID */ - const char * string_attr = "2.0"; /* The attribute data */ + const char *string_attr = "2.0"; /* The attribute data */ int ret; /* Return value */ int i; /* Local index variable */ @@ -124,7 +124,7 @@ tts_attr_vlen_thread(void H5_ATTR_UNUSED *client_data) hid_t gid = H5I_INVALID_HID; /* Group ID */ hid_t aid = H5I_INVALID_HID; /* Attribute ID */ hid_t atid = H5I_INVALID_HID; /* Datatype ID for the attribute */ - char * string_attr_check; /* The attribute data being read */ + char *string_attr_check; /* The attribute data being read */ const char *string_attr = "2.0"; /* The expected attribute data */ herr_t ret; /* Return value */ diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c index acaa9d6..2154f87 100644 --- a/test/ttsafe_cancel.c +++ b/test/ttsafe_cancel.c @@ -39,7 +39,7 @@ #define FILENAME "ttsafe_cancel.h5" #define DATASETNAME "commonname" -void * tts_cancel_thread(void *); +void *tts_cancel_thread(void *); void tts_cancel_barrier(void); herr_t tts_cancel_callback(void *, hid_t, unsigned, const hsize_t *, void *); void cancellation_cleanup(void *); diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c index 336fc9e..7c92d65 100644 --- a/test/ttsafe_error.c +++ b/test/ttsafe_error.c @@ -57,7 +57,7 @@ H5TS_mutex_simple_t error_mutex_g; /* Prototypes */ static herr_t error_callback(hid_t, void *); static herr_t walk_error_callback(unsigned, const H5E_error2_t *, void *); -static void * tts_error_thread(void *); +static void *tts_error_thread(void *); void tts_error(void) @@ -146,7 +146,7 @@ tts_error_thread(void H5_ATTR_UNUSED *arg) hid_t dataset = H5I_INVALID_HID; hsize_t dimsf[1]; /* dataset dimensions */ H5E_auto2_t old_error_cb; - void * old_error_client_data; + void *old_error_client_data; int value; herr_t status; diff --git a/test/tunicode.c b/test/tunicode.c index f719ffd..2c1fc76 100644 --- a/test/tunicode.c +++ b/test/tunicode.c @@ -317,7 +317,7 @@ test_vl_string(hid_t fid, const char *string) hid_t type_id, space_id, dset_id; hsize_t dims = 1; hsize_t size; /* Number of bytes used */ - char * read_buf[1]; + char *read_buf[1]; herr_t ret; /* Create dataspace for datasets */ @@ -582,7 +582,7 @@ test_compound(hid_t fid, const char *string) hid_t s1_tid, s2_tid; hid_t space_id, dset_id; hsize_t dim = 1; - char * readbuf; + char *readbuf; herr_t ret; /* Initialize compound data */ @@ -698,7 +698,7 @@ void test_opaque(hid_t H5_ATTR_UNUSED fid, const char *string) { hid_t type_id; - char * read_buf; + char *read_buf; herr_t ret; /* Create an opaque type and give it a UTF-8 tag */ diff --git a/test/tvlstr.c b/test/tvlstr.c index 5fb7a10..7cc1142 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -39,7 +39,7 @@ /* String for testing attributes */ static const char *string_att = "This is the string for the attribute"; -static char * string_att_write = NULL; +static char *string_att_write = NULL; void *test_vlstr_alloc_custom(size_t size, void *info); void test_vlstr_free_custom(void *mem, void *info); @@ -55,7 +55,7 @@ void test_vlstr_free_custom(void *mem, void *info); void * test_vlstr_alloc_custom(size_t size, void *info) { - void * ret_value = NULL; /* Pointer to return */ + void *ret_value = NULL; /* Pointer to return */ size_t *mem_used = (size_t *)info; /* Get the pointer to the memory used */ size_t extra; /* Extra space needed */ @@ -85,7 +85,7 @@ void test_vlstr_free_custom(void *_mem, void *info) { unsigned char *mem; - size_t * mem_used = (size_t *)info; /* Get the pointer to the memory used */ + size_t *mem_used = (size_t *)info; /* Get the pointer to the memory used */ size_t extra; /* Extra space needed */ /* @@ -117,8 +117,8 @@ test_vlstrings_basic(void) "Now we are engaged in a great civil war,", "testing whether that nation or any nation so conceived and so dedicated can long endure."}; - char * rdata[SPACE1_DIM1]; /* Information read in */ - char * wdata2; + char *rdata[SPACE1_DIM1]; /* Information read in */ + char *wdata2; hid_t dataspace, dataset2; hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ @@ -253,8 +253,8 @@ test_vlstrings_special(void) { const char *wdata[SPACE1_DIM1] = {"", "two", "three", "\0"}; const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL}; - char * rdata[SPACE1_DIM1]; /* Information read in */ - char * fill; /* Fill value */ + char *rdata[SPACE1_DIM1]; /* Information read in */ + char *fill; /* Fill value */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -486,7 +486,7 @@ static void test_compact_vlstring(void) { const char *wdata[SPACE1_DIM1] = {"one", "two", "three", "four"}; - char * rdata[SPACE1_DIM1]; /* Information read in */ + char *rdata[SPACE1_DIM1]; /* Information read in */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -583,7 +583,7 @@ test_write_vl_string_attribute(void) hid_t file, root, dataspace, att; hid_t type; herr_t ret; - char * string_att_check = NULL; + char *string_att_check = NULL; /* Open the file */ file = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT); @@ -673,7 +673,7 @@ test_read_vl_string_attribute(void) hid_t file, root, att; hid_t type; herr_t ret; - char * string_att_check = NULL; + char *string_att_check = NULL; /* Open file */ file = H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -762,7 +762,7 @@ read_scalar_dset(hid_t file, hid_t type, hid_t space, char *name, char *data) { hid_t dset; herr_t ret; - char * data_read; + char *data_read; dset = H5Dopen2(file, name, H5P_DEFAULT); CHECK(dset, FAIL, "H5Dopen2"); diff --git a/test/tvltypes.c b/test/tvltypes.c index e70f96b..1b9bfad 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -55,7 +55,7 @@ void test_vltypes_free_custom(void *mem, void *info); void * test_vltypes_alloc_custom(size_t size, void *mem_used) { - void * ret_value; /* Pointer to return */ + void *ret_value; /* Pointer to return */ const size_t extra = MAX(sizeof(void *), sizeof(size_t)); /* Extra space needed */ /* (This weird contortion is required on the * DEC Alpha to keep the alignment correct - QAK) @@ -1034,15 +1034,15 @@ test_vltypes_compound_vlen_vlen(void) float f; hvl_t v; } s1; - s1 * wdata; /* data to write */ - s1 * rdata; /* data to read */ + s1 *wdata; /* data to write */ + s1 *rdata; /* data to read */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ hid_t tid1, tid2, tid3; /* Datatype IDs */ hsize_t dims1[] = {SPACE3_DIM1}; unsigned i, j, k; /* counting variables */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1230,7 +1230,7 @@ test_vltypes_compound_vlstr(void) hsize_t size[] = {SPACE1_DIM1}; hsize_t offset[] = {0}; unsigned i, j; /* counting variables */ - s2 * t1, *t2; /* Temporary pointer to VL information */ + s2 *t1, *t2; /* Temporary pointer to VL information */ int val; herr_t ret; /* Generic return value */ @@ -1918,7 +1918,7 @@ test_vltypes_vlen_vlen_atomic(void) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -2119,7 +2119,7 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -2299,7 +2299,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -2487,17 +2487,17 @@ test_vltypes_fill_value(void) typedef struct dtype1_struct { unsigned int gui; unsigned int pgui; - const char * str_id; - const char * str_name; - const char * str_desc; - const char * str_orig; - const char * str_stat; + const char *str_id; + const char *str_name; + const char *str_desc; + const char *str_orig; + const char *str_stat; unsigned int ver; double val; double ma; double mi; - const char * str_form; - const char * str_unit; + const char *str_form; + const char *str_unit; } dtype1_struct; herr_t ret; @@ -2529,7 +2529,7 @@ test_vltypes_fill_value(void) const dtype1_struct fill1 = {1, 2, "foobar", "", NULL, "\0", "dead", 3, 4.0F, 100.0F, 1.0F, "liquid", "meter"}; const dtype1_struct wdata = {3, 4, "", NULL, "\0", "foo", "two", 6, 8.0F, 200.0F, 2.0F, "solid", "yard"}; - dtype1_struct * rbuf = NULL; /* Buffer for reading data */ + dtype1_struct *rbuf = NULL; /* Buffer for reading data */ size_t mem_used = 0; /* Memory used during allocation */ H5D_layout_t layout; /* Dataset storage layout */ char dset_name1[64], dset_name2[64]; /* Dataset names */ diff --git a/test/unlink.c b/test/unlink.c index 744fe6e..a154671 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -565,8 +565,8 @@ test_filespace(hid_t fapl) FILESPACE_CHUNK2}; /* Chunk dimensions */ hsize_t attr_dims[FILESPACE_ATTR_NDIMS] = {FILESPACE_ATTR_DIM0, FILESPACE_ATTR_DIM1}; /* Attribute dimensions */ - int * data = NULL; /* Pointer to dataset buffer */ - int * tmp_data; /* Temporary pointer to dataset buffer */ + int *data = NULL; /* Pointer to dataset buffer */ + int *tmp_data; /* Temporary pointer to dataset buffer */ h5_stat_size_t empty_size; /* Size of an empty file */ h5_stat_size_t file_size; /* Size of each file created */ herr_t status; /* Function status return value */ diff --git a/test/unregister.c b/test/unregister.c index c6da4df..b2e1a57 100644 --- a/test/unregister.c +++ b/test/unregister.c @@ -90,8 +90,8 @@ test_unregister_filters(hid_t fapl_id) char filename[FILENAME_BUF_SIZE]; const hsize_t chunk_dims[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2}; /* Chunk dimensions */ hsize_t dims[2]; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; herr_t ret; TESTING("Unregistering filter"); @@ -49,7 +49,7 @@ typedef struct options_t { hsize_t dims[UC_RANK]; /* dataset initial dims */ hsize_t max_dims[UC_RANK]; /* dataset max dims */ hsize_t nplanes; /* number of planes to write, default proportional to chunksize */ - char * filename; /* use case data filename */ + char *filename; /* use case data filename */ part_t launch; /* launch writer, reader or both */ hbool_t use_swmr; /* use swmr open (1) or not */ int iterations; /* iterations, default 1 */ diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c index f28e574..d1b693b 100644 --- a/test/use_disable_mdc_flushes.c +++ b/test/use_disable_mdc_flushes.c @@ -40,7 +40,7 @@ const char *progname_g = "use_disable_mdc_flushes"; /* program name */ goto done; \ } -char * filename_g; +char *filename_g; hsize_t nplanes_g; int use_swmr_g; int chunkplanes_g; @@ -298,7 +298,7 @@ write_file(void) hid_t dsid; /* dataset ID */ hid_t fapl; /* File access property list */ hid_t dcpl; /* Dataset creation property list */ - char * name; + char *name; UC_CTYPE *buffer, *bufptr; /* data buffer */ hsize_t cz = (hsize_t)chunksize_g; /* Chunk size */ hid_t f_sid; /* dataset file space id */ @@ -106,8 +106,8 @@ vds_select_equal(hid_t space1, hid_t space2) { H5S_sel_type type1; H5S_sel_type type2; - hsize_t * buf1 = NULL; - hsize_t * buf2 = NULL; + hsize_t *buf1 = NULL; + hsize_t *buf2 = NULL; size_t i; htri_t ret_value = TRUE; @@ -349,7 +349,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex hid_t file = -1; /* File */ hid_t dset = -1; /* Virtual dataset */ H5D_space_status_t space_status; /* Dataset space status */ - void * plist_buf = NULL; /* Serialized property list buffer */ + void *plist_buf = NULL; /* Serialized property list buffer */ H5O_info_t oinfo; /* Object info struct */ htri_t tri_ret; @@ -1168,11 +1168,11 @@ error: static int test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) { - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * vfilename = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *vfilename = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; const char *srcfilenamepct_map_orig = "vds%%%%_src"; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ hid_t vfile = -1; /* File with virtual dset */ @@ -1446,12 +1446,12 @@ error: static int test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) { - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * vfilename = NULL; - char * vfilename2 = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *vfilename = NULL; + char *vfilename2 = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; const char *srcfilenamepct_map_orig = "vds%%%%_src"; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ hid_t vfile = -1; /* File with virtual dset */ @@ -6655,14 +6655,14 @@ error: static int test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) { - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * srcfilename2 = NULL; - char * srcfilename2_map = NULL; - char * vfilename = NULL; - char * printf_srcfilename_map = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *srcfilename2 = NULL; + char *srcfilename2_map = NULL; + char *vfilename = NULL; + char *printf_srcfilename_map = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; const char *printf_srcfilename_map_orig = "vds_src_%b"; const char *srcfilenamepct_map_orig = "vds%%%%_src"; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ diff --git a/test/vds_env.c b/test/vds_env.c index 959fc94..b8d8bbd 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -45,12 +45,12 @@ static int test_vds_prefix_second(unsigned config, hid_t fapl) { const char *srcfilenamepct_map_orig = "vds%%%%_src"; - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * vfilename = NULL; - char * vfilename2 = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *vfilename = NULL; + char *vfilename2 = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ hid_t vfile = -1; /* File with virtual dset */ hid_t dcpl = -1; /* Dataset creation property list */ diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c index e16707f..32ffa5a 100644 --- a/test/vds_swmr_reader.c +++ b/test/vds_swmr_reader.c @@ -29,7 +29,7 @@ main(void) int n_elements = 0; /* size of buffer (elements) */ size_t size = 0; /* size of buffer (bytes) */ - int * buffer = NULL; /* data buffer */ + int *buffer = NULL; /* data buffer */ int n_dims = -1; /* # dimensions in dataset */ hsize_t dims[RANK]; /* current size of dataset */ @@ -87,8 +87,8 @@ static int __k; /* Helper structure to pass around dataset information. */ struct splitter_dataset_def { - void * buf; /* contents of dataset */ - const char * dset_name; /* dataset name, always added to root group */ + void *buf; /* contents of dataset */ + const char *dset_name; /* dataset name, always added to root group */ hid_t mem_type_id; /* datatype */ const hsize_t *dims; /* dimensions */ int n_dims; /* rank */ @@ -126,7 +126,7 @@ test_sec2(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; /* filename */ - void * os_file_handle = NULL; /* OS file handle */ + void *os_file_handle = NULL; /* OS file handle */ hsize_t file_size; /* file size */ TESTING("SEC2 file driver"); @@ -243,16 +243,16 @@ test_core(void) hid_t did = -1; /* dataset ID */ hid_t sid = -1; /* dataspace ID */ char filename[1024]; /* filename */ - void * os_file_handle = NULL; /* OS file handle */ + void *os_file_handle = NULL; /* OS file handle */ hsize_t file_size; /* file size */ size_t increment; /* core VFD increment */ hbool_t backing_store; /* use backing store? */ hbool_t use_write_tracking; /* write tracking flag */ size_t write_tracking_page_size; /* write tracking page size */ - int * data_w = NULL; /* data written to the dataset */ - int * data_r = NULL; /* data read from the dataset */ + int *data_w = NULL; /* data written to the dataset */ + int *data_r = NULL; /* data read from the dataset */ int val; /* data value */ - int * pw = NULL, *pr = NULL; /* pointers for iterating over + int *pw = NULL, *pr = NULL; /* pointers for iterating over data arrays (write & read) */ hsize_t dims[2]; /* dataspace dimensions */ int i, j; /* iterators */ @@ -599,14 +599,14 @@ test_direct(void) hid_t file = -1, fapl = -1, access_fapl = -1; hid_t dset1 = -1, dset2 = -1, space1 = -1, space2 = -1; char filename[1024]; - int * fhandle = NULL; + int *fhandle = NULL; hsize_t file_size; hsize_t dims1[2], dims2[1]; size_t mbound; size_t fbsize; size_t cbsize; - void * proto_points = NULL, *proto_check = NULL; - int * points = NULL, *check = NULL, *p1 = NULL, *p2 = NULL; + void *proto_points = NULL, *proto_check = NULL; + int *points = NULL, *check = NULL, *p1 = NULL, *p2 = NULL; int wdata2[DSET2_DIM] = {11, 12, 13, 14}; int rdata2[DSET2_DIM]; int i, j, n; @@ -916,9 +916,9 @@ test_family(void) char filename[1024]; char dname[] = "dataset"; unsigned int i, j; - int * fhandle = NULL, *fhandle2 = NULL; - int ** buf = NULL; - int * buf_data = NULL; + int *fhandle = NULL, *fhandle2 = NULL; + int **buf = NULL; + int *buf_data = NULL; hsize_t dims[2] = {FAMILY_NUMBER, FAMILY_SIZE}; hsize_t file_size; @@ -1230,8 +1230,8 @@ test_family_member_fapl(void) char dname[] = "dataset"; unsigned i = 0; unsigned j = 0; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; hsize_t dims[2] = {FAMILY_NUMBER, FAMILY_SIZE}; TESTING("Family member FAPL"); @@ -1387,20 +1387,20 @@ test_multi(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - int * fhandle2 = NULL, *fhandle = NULL; + int *fhandle2 = NULL, *fhandle = NULL; hsize_t file_size; H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - const char * memb_name[H5FD_MEM_NTYPES]; + const char *memb_name[H5FD_MEM_NTYPES]; char sv[H5FD_MEM_NTYPES][32]; hsize_t dims[2] = {MULTI_SIZE, MULTI_SIZE}; hsize_t adims[1] = {1}; char dname[] = "dataset"; char meta[] = "this is some metadata on this file"; int i, j; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; TESTING("MULTI file driver"); @@ -1651,8 +1651,8 @@ test_multi_compat(void) char sv[H5FD_MEM_NTYPES][32]; hsize_t dims[2] = {MULTI_SIZE, MULTI_SIZE}; int i, j; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; TESTING("MULTI file driver backward compatibility"); @@ -1831,7 +1831,7 @@ test_log(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - int * fhandle = NULL; + int *fhandle = NULL; hsize_t file_size = 0; unsigned int flags = H5FD_LOG_ALL; size_t buf_size = 4 * KB; @@ -1957,7 +1957,7 @@ test_stdio(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - FILE * fhandle = NULL; + FILE *fhandle = NULL; hsize_t file_size = 0; TESTING("STDIO file driver"); @@ -2066,7 +2066,7 @@ test_windows(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - int * fhandle = NULL; + int *fhandle = NULL; hsize_t file_size = 0; #endif /*H5_HAVE_WINDOWS*/ @@ -2374,8 +2374,8 @@ run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_err hid_t fapl_id_out = H5I_INVALID_HID; hid_t fapl_id_cpy = H5I_INVALID_HID; H5FD_splitter_vfd_config_t *vfd_config = NULL; - char * filename_rw = NULL; - FILE * logfile = NULL; + char *filename_rw = NULL; + FILE *logfile = NULL; int ret_value = 0; if (NULL == (vfd_config = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) @@ -2604,7 +2604,7 @@ error: static int splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id) { - char * filename_rw = NULL; + char *filename_rw = NULL; H5FD_splitter_vfd_config_t *vfd_config = NULL; hid_t fapl_id = H5I_INVALID_HID; hid_t file_id = H5I_INVALID_HID; @@ -2947,8 +2947,8 @@ done: static int splitter_tentative_open_test(hid_t child_fapl_id) { - const char * filename_tmp = "splitter_tmp.h5"; - char * filename_rw = NULL; + const char *filename_tmp = "splitter_tmp.h5"; + char *filename_rw = NULL; H5FD_splitter_vfd_config_t *vfd_config = NULL; hid_t fapl_id = H5I_INVALID_HID; hid_t file_id = H5I_INVALID_HID; |