diff options
Diffstat (limited to 'tools/test')
-rw-r--r-- | tools/test/h5copy/h5copygentest.c | 2 | ||||
-rw-r--r-- | tools/test/h5dump/h5dumpgentest.c | 4 | ||||
-rw-r--r-- | tools/test/h5format_convert/h5fc_chk_idx.c | 2 | ||||
-rw-r--r-- | tools/test/h5format_convert/h5fc_gentest.c | 8 | ||||
-rw-r--r-- | tools/test/h5repack/h5repackgentest.c | 22 | ||||
-rw-r--r-- | tools/test/h5repack/h5repacktst.c | 184 | ||||
-rw-r--r-- | tools/test/misc/clear_open_chk.c | 2 | ||||
-rw-r--r-- | tools/test/misc/h5clear_gentest.c | 14 | ||||
-rw-r--r-- | tools/test/misc/vds/UC_common.h | 4 | ||||
-rw-r--r-- | tools/test/perform/overhead.c | 38 | ||||
-rw-r--r-- | tools/test/perform/perf_meta.c | 18 | ||||
-rw-r--r-- | tools/test/perform/zip_perf.c | 16 |
12 files changed, 155 insertions, 159 deletions
diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c index db50693..ac19f34 100644 --- a/tools/test/h5copy/h5copygentest.c +++ b/tools/test/h5copy/h5copygentest.c @@ -723,7 +723,7 @@ Test_Obj_Copy(void) } /* Test with old & new format groups */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { /* Set the FAPL for the type of format */ /* Create source file */ diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c index aad1b8d..1b4b85c 100644 --- a/tools/test/h5dump/h5dumpgentest.c +++ b/tools/test/h5dump/h5dumpgentest.c @@ -3891,7 +3891,7 @@ gent_multi(void) } memb_map[H5FD_MEM_DEFAULT] = H5FD_MEM_SUPER; - H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE); + H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, false); fid = H5Fcreate(FILE36, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); @@ -7133,7 +7133,7 @@ gent_fs_strategy_threshold(void) fcpl = H5Pcreate(H5P_FILE_CREATE); /* Set file space information */ - H5Pset_file_space_strategy(fcpl, STRATEGY, TRUE, (hsize_t)THRESHOLD10); + H5Pset_file_space_strategy(fcpl, STRATEGY, true, (hsize_t)THRESHOLD10); H5Pset_file_space_page_size(fcpl, (hsize_t)FSPACE_PAGE_SIZE); /* Create the file with the specified strategy and threshold */ diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c index 49fbbab..51309f6 100644 --- a/tools/test/h5format_convert/h5fc_chk_idx.c +++ b/tools/test/h5format_convert/h5fc_chk_idx.c @@ -59,7 +59,7 @@ main(int argc, char *argv[]) dname = HDstrdup(argv[2]); /* Try opening the file */ - if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) { + if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, false, NULL, (size_t)0)) < 0) { fprintf(stderr, "h5fc_chk_idx: unable to open the file\n"); exit(EXIT_FAILURE); } /* end if */ diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c index 5b8bfce..ff0f02e 100644 --- a/tools/test/h5format_convert/h5fc_gentest.c +++ b/tools/test/h5format_convert/h5fc_gentest.c @@ -572,7 +572,7 @@ gen_ext(const char *fname, unsigned new_format, unsigned what) H5Pset_shared_mesg_nindexes(fcpl, 4); break; case 2: - H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1); + H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1); break; case 3: H5Pset_istore_k(fcpl, ISTORE_IK); @@ -580,7 +580,7 @@ gen_ext(const char *fname, unsigned new_format, unsigned what) break; case 4: H5Pset_istore_k(fcpl, ISTORE_IK); - H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1); + H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1); break; case 5: H5Pset_shared_mesg_nindexes(fcpl, 4); @@ -589,7 +589,7 @@ gen_ext(const char *fname, unsigned new_format, unsigned what) case 6: H5Pset_istore_k(fcpl, ISTORE_IK); H5Pset_shared_mesg_nindexes(fcpl, 4); - H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1); + H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1); break; default: break; @@ -793,7 +793,7 @@ main(void) gen_err_level(ERR_LEVEL_FILE); /* Generate old/new format file with/without messages in the superblock extension */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { for (i = 0; i < 8; i++) { char filename[50]; diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c index 8910abb..203581d 100644 --- a/tools/test/h5repack/h5repackgentest.c +++ b/tools/test/h5repack/h5repackgentest.c @@ -173,7 +173,7 @@ done: * Returns 0 on success, -1 on failure. */ static int -generate_int32le_1d(hbool_t external) +generate_int32le_1d(bool external) { int32_t wdata[12]; hsize_t dims[] = {12}; @@ -188,7 +188,7 @@ generate_int32le_1d(hbool_t external) wdata[n] = n - 6; } - def_ptr = (TRUE == external) ? (&def) : NULL; + def_ptr = (true == external) ? (&def) : NULL; if (make_file(FILE_INT32LE_1, def_ptr, H5T_STD_I32LE, 1, dims, wdata) < 0) ret_value = -1; @@ -199,7 +199,7 @@ generate_int32le_1d(hbool_t external) * Returns 0 on success, -1 on failure. */ static int -generate_int32le_2d(hbool_t external) +generate_int32le_2d(bool external) { int32_t wdata[64]; hsize_t dims[] = {8, 8}; @@ -214,7 +214,7 @@ generate_int32le_2d(hbool_t external) wdata[n] = n - 32; } - def_ptr = (TRUE == external) ? (&def) : NULL; + def_ptr = (true == external) ? (&def) : NULL; if (make_file(FILE_INT32LE_2, def_ptr, H5T_STD_I32LE, 2, dims, wdata) < 0) ret_value = -1; @@ -225,7 +225,7 @@ generate_int32le_2d(hbool_t external) * Returns 0 on success, -1 on failure. */ static int -generate_int32le_3d(hbool_t external) +generate_int32le_3d(bool external) { hsize_t dims[] = {8, 8, 8}; int32_t wdata[512]; /* 8^3, from dims */ @@ -247,7 +247,7 @@ generate_int32le_3d(hbool_t external) } } - def_ptr = (TRUE == external) ? (&def) : NULL; + def_ptr = (true == external) ? (&def) : NULL; if (make_file(FILE_INT32LE_3, def_ptr, H5T_STD_I32LE, 3, dims, wdata) < 0) ret_value = -1; @@ -258,7 +258,7 @@ generate_int32le_3d(hbool_t external) * Returns 0 on success, -1 on failure. */ static int -generate_uint8be(hbool_t external) +generate_uint8be(bool external) { hsize_t dims[] = {4, 8, 8}; uint8_t wdata[256]; /* 4*8*8, from dims */ @@ -280,7 +280,7 @@ generate_uint8be(hbool_t external) } } - def_ptr = (TRUE == external) ? (&def) : NULL; + def_ptr = (true == external) ? (&def) : NULL; if (make_file(FILE_UINT8BE, def_ptr, H5T_STD_U8BE, 3, dims, wdata) < 0) ret_value = -1; @@ -291,7 +291,7 @@ generate_uint8be(hbool_t external) * Returns 0 on success, -1 on failure. */ static int -generate_f32le(hbool_t external) +generate_f32le(bool external) { hsize_t dims[] = {12, 6}; float wdata[72]; /* 12*6, from dims */ @@ -310,7 +310,7 @@ generate_f32le(hbool_t external) } } - def_ptr = (TRUE == external) ? (&def) : NULL; + def_ptr = (true == external) ? (&def) : NULL; if (make_file(FILE_F32LE, def_ptr, H5T_IEEE_F32LE, 2, dims, wdata) < 0) ret_value = -1; @@ -327,7 +327,7 @@ main(void) int i = 0; for (i = 0; i < 2; i++) { - hbool_t external = (i & 1) ? TRUE : FALSE; + bool external = (i & 1) ? true : false; if (generate_int32le_1d(external) < 0) printf("A generate_int32le_1d failed!\n"); diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c index 00a7ae2..6fa2d8d 100644 --- a/tools/test/h5repack/h5repacktst.c +++ b/tools/test/h5repack/h5repacktst.c @@ -182,7 +182,7 @@ main(void) h5_stat_t file_stat; h5_stat_size_t fsize1, fsize2; /* file sizes */ - hbool_t driver_is_parallel; + bool driver_is_parallel; #if defined(H5_HAVE_FILTER_SZIP) int szip_can_encode = 0; #endif @@ -224,7 +224,7 @@ main(void) j = 0; /* #0 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(fname, FSPACE_OUT, &pack_options) < 0) @@ -241,10 +241,10 @@ main(void) ++j; /* #1 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; pack_options.fs_strategy = H5F_FSPACE_STRATEGY_NONE; - pack_options.fs_persist = -1; /* "FALSE" is set via -P 0 */ + pack_options.fs_persist = -1; /* "false" is set via -P 0 */ pack_options.fs_threshold = 1; pack_options.fs_pagesize = 8192; if (h5repack(fname, FSPACE_OUT, &pack_options) < 0) @@ -261,7 +261,7 @@ main(void) ++j; /* #2 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; pack_options.fs_strategy = (H5F_fspace_strategy_t)-1; /* "FSM_AGGR" specified via -S FSM_AGGR */ pack_options.fs_threshold = -1; /* "0" specified via -T 0 */ @@ -280,10 +280,10 @@ main(void) ++j; /* #3 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, TRUE) < 0) + if (h5repack_init(&pack_options, 0, true) < 0) GOERROR; pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE; /* "PAGE" specified via -S */ - pack_options.fs_persist = TRUE; + pack_options.fs_persist = true; if (h5repack(fname, FSPACE_OUT, &pack_options) < 0) GOERROR; if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0) @@ -298,9 +298,9 @@ main(void) ++j; /* #4 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, TRUE) < 0) + if (h5repack_init(&pack_options, 0, true) < 0) GOERROR; - pack_options.fs_persist = -1; /* "FALSE" is set via -P 0 */ + pack_options.fs_persist = -1; /* "false" is set via -P 0 */ pack_options.fs_threshold = 2; if (h5repack(fname, FSPACE_OUT, &pack_options) < 0) GOERROR; @@ -316,7 +316,7 @@ main(void) ++j; /* #5 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, TRUE) < 0) + if (h5repack_init(&pack_options, 0, true) < 0) GOERROR; pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE; pack_options.fs_pagesize = 8192; @@ -334,10 +334,10 @@ main(void) ++j; /* #6 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; pack_options.fs_strategy = H5F_FSPACE_STRATEGY_NONE; - pack_options.fs_persist = -1; /* "FALSE" is set via -P 0 */ + pack_options.fs_persist = -1; /* "false" is set via -P 0 */ pack_options.fs_threshold = 1; pack_options.fs_pagesize = 8192; if (h5repack(fname, FSPACE_OUT, &pack_options) < 0) @@ -354,7 +354,7 @@ main(void) ++j; /* #7 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); fname = H5REPACK_FSPACE_FNAMES[j]; - if (h5repack_init(&pack_options, 0, TRUE) < 0) + if (h5repack_init(&pack_options, 0, true) < 0) GOERROR; pack_options.fs_strategy = H5F_FSPACE_STRATEGY_AGGR; pack_options.fs_threshold = 1; @@ -376,7 +376,7 @@ main(void) */ TESTING(" copy of datasets (fill values)"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME0, FNAME0OUT, &pack_options) < 0) GOERROR; @@ -396,7 +396,7 @@ main(void) */ if (!driver_is_parallel) { TESTING(" copy of datasets (all datatypes)"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0) GOERROR; @@ -416,7 +416,7 @@ main(void) *------------------------------------------------------------------------- */ TESTING(" copy of datasets (attributes)"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME2, FNAME2OUT, &pack_options) < 0) GOERROR; @@ -435,7 +435,7 @@ main(void) *------------------------------------------------------------------------- */ TESTING(" copy of datasets (hardlinks)"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME3, FNAME3OUT, &pack_options) < 0) GOERROR; @@ -455,7 +455,7 @@ main(void) *------------------------------------------------------------------------- */ TESTING(" copy of allocation early file"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME5, FNAME5OUT, &pack_options) < 0) GOERROR; @@ -485,7 +485,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset1:GZIP=9", &pack_options) < 0) GOERROR; @@ -512,7 +512,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, TRUE) < 0) + if (h5repack_init(&pack_options, 0, true) < 0) GOERROR; if (h5repack_addfilter("dset1:GZIP=9", &pack_options) < 0) GOERROR; @@ -540,7 +540,7 @@ main(void) #ifdef H5_HAVE_FILTER_DEFLATE - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("GZIP=1", &pack_options) < 0) GOERROR; @@ -577,7 +577,7 @@ main(void) */ if (szip_can_encode) { - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset2:SZIP=8,EC", &pack_options) < 0) GOERROR; @@ -609,7 +609,7 @@ main(void) #if defined(H5_HAVE_FILTER_SZIP) if (szip_can_encode) { - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("SZIP=8,NN", &pack_options) < 0) GOERROR; @@ -638,7 +638,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset1:SHUF", &pack_options) < 0) GOERROR; @@ -662,7 +662,7 @@ main(void) TESTING(" adding shuffle filter to all"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("SHUF", &pack_options) < 0) GOERROR; @@ -685,7 +685,7 @@ main(void) * test an individual object option *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset1:FLET", &pack_options) < 0) GOERROR; @@ -708,7 +708,7 @@ main(void) */ TESTING(" adding checksum filter to all"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("FLET", &pack_options) < 0) GOERROR; @@ -732,7 +732,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset1:CHUNK 20x10", &pack_options) < 0) GOERROR; @@ -771,7 +771,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0) GOERROR; @@ -793,7 +793,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, TRUE) < 0) + if (h5repack_init(&pack_options, 0, true) < 0) GOERROR; if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0) GOERROR; @@ -813,7 +813,7 @@ main(void) */ TESTING(" adding layout chunked to all"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("CHUNK=20x10", &pack_options) < 0) GOERROR; @@ -834,7 +834,7 @@ main(void) * test an individual object option *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset1:CONTI", &pack_options) < 0) GOERROR; @@ -855,7 +855,7 @@ main(void) * test all objects option *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("CONTI", &pack_options) < 0) GOERROR; @@ -872,7 +872,7 @@ main(void) * do the same test for a file with filters (chunked) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("CONTI", &pack_options) < 0) GOERROR; @@ -894,7 +894,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset1:COMPA", &pack_options) < 0) GOERROR; @@ -915,7 +915,7 @@ main(void) *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("COMPA", &pack_options) < 0) GOERROR; @@ -936,7 +936,7 @@ main(void) * layout compact to contiguous conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_compact:CONTI", &pack_options) < 0) GOERROR; @@ -956,7 +956,7 @@ main(void) * layout compact to chunk conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_compact:CHUNK=2x5", &pack_options) < 0) GOERROR; @@ -976,7 +976,7 @@ main(void) * layout compact to compact conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_compact:COMPA", &pack_options) < 0) GOERROR; @@ -995,7 +995,7 @@ main(void) * layout contiguous to compact conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_contiguous:COMPA", &pack_options) < 0) GOERROR; @@ -1014,7 +1014,7 @@ main(void) * layout contiguous to chunk conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_contiguous:CHUNK=3x6", &pack_options) < 0) GOERROR; @@ -1034,7 +1034,7 @@ main(void) * layout contiguous to contiguous conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_contiguous:CONTI", &pack_options) < 0) GOERROR; @@ -1053,7 +1053,7 @@ main(void) * layout chunked to compact conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_chunk:COMPA", &pack_options) < 0) GOERROR; @@ -1073,7 +1073,7 @@ main(void) * layout chunked to contiguous conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_chunk:CONTI", &pack_options) < 0) GOERROR; @@ -1092,7 +1092,7 @@ main(void) * layout chunked to chunked conversion *------------------------------------------------------------------------- */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addlayout("dset_chunk:CHUNK=18x13", &pack_options) < 0) GOERROR; @@ -1119,7 +1119,7 @@ main(void) #if defined(H5_HAVE_FILTER_SZIP) if (szip_can_encode) { - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME7, FNAME7OUT, &pack_options) < 0) GOERROR; @@ -1145,7 +1145,7 @@ main(void) #if defined(H5_HAVE_FILTER_SZIP) if (szip_can_encode) { - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_szip:NONE", &pack_options) < 0) GOERROR; @@ -1170,7 +1170,7 @@ main(void) TESTING(" copy of deflate filter"); #ifdef H5_HAVE_FILTER_DEFLATE - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME8, FNAME8OUT, &pack_options) < 0) GOERROR; @@ -1189,7 +1189,7 @@ main(void) TESTING(" removing deflate filter"); #ifdef H5_HAVE_FILTER_DEFLATE - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_deflate:NONE", &pack_options) < 0) GOERROR; @@ -1209,7 +1209,7 @@ main(void) TESTING(" copy of shuffle filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME9, FNAME9OUT, &pack_options) < 0) GOERROR; @@ -1224,7 +1224,7 @@ main(void) TESTING(" removing shuffle filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_shuffle:NONE", &pack_options) < 0) GOERROR; @@ -1241,7 +1241,7 @@ main(void) TESTING(" copy of fletcher filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME10, FNAME10OUT, &pack_options) < 0) GOERROR; @@ -1256,7 +1256,7 @@ main(void) TESTING(" removing fletcher filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_fletcher32:NONE", &pack_options) < 0) GOERROR; @@ -1273,7 +1273,7 @@ main(void) TESTING(" copy of nbit filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME12, FNAME12OUT, &pack_options) < 0) GOERROR; @@ -1288,7 +1288,7 @@ main(void) TESTING(" removing nbit filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_nbit:NONE", &pack_options) < 0) GOERROR; @@ -1305,7 +1305,7 @@ main(void) TESTING(" adding nbit filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_int31:NBIT", &pack_options) < 0) GOERROR; @@ -1322,7 +1322,7 @@ main(void) TESTING(" copy of scaleoffset filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME13, FNAME13OUT, &pack_options) < 0) GOERROR; @@ -1337,7 +1337,7 @@ main(void) TESTING(" removing scaleoffset filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_scaleoffset:NONE", &pack_options) < 0) GOERROR; @@ -1354,7 +1354,7 @@ main(void) TESTING(" adding scaleoffset filter"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_none:SOFF=31,IN", &pack_options) < 0) GOERROR; @@ -1383,7 +1383,7 @@ main(void) #if defined(H5_HAVE_FILTER_SZIP) && defined(H5_HAVE_FILTER_DEFLATE) if (szip_can_encode) { - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_deflate:SZIP=8,NN", &pack_options) < 0) GOERROR; @@ -1410,7 +1410,7 @@ main(void) #if defined(H5_HAVE_FILTER_SZIP) && defined(H5_HAVE_FILTER_DEFLATE) if (szip_can_encode) { - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("dset_szip:GZIP=1", &pack_options) < 0) GOERROR; @@ -1441,7 +1441,7 @@ main(void) #if defined(H5_HAVE_FILTER_SZIP) && defined(H5_HAVE_FILTER_DEFLATE) - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("NONE", &pack_options) < 0) GOERROR; @@ -1465,7 +1465,7 @@ main(void) */ TESTING(" big file"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME14, FNAME14OUT, &pack_options) < 0) GOERROR; @@ -1482,7 +1482,7 @@ main(void) *------------------------------------------------------------------------- */ TESTING(" external datasets"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME15, FNAME15OUT, &pack_options) < 0) GOERROR; @@ -1500,7 +1500,7 @@ main(void) *------------------------------------------------------------------------- */ TESTING(" file with userblock"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME16, FNAME16OUT, &pack_options) < 0) GOERROR; @@ -1521,7 +1521,7 @@ main(void) */ if (!driver_is_parallel) { TESTING(" latest file format options"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; pack_options.latest = 1; pack_options.grp_compact = 10; @@ -1551,7 +1551,7 @@ main(void) #if defined(H5_HAVE_FILTER_DEFLATE) - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack_addfilter("GZIP=1", &pack_options) < 0) GOERROR; @@ -1580,7 +1580,7 @@ main(void) #ifdef H5_HAVE_FILTER_DEFLATE - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; /* add the options for a user block size and user block filename */ @@ -1612,7 +1612,7 @@ main(void) #ifdef H5_HAVE_FILTER_DEFLATE - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; /* add the options for alignment */ @@ -1663,7 +1663,7 @@ main(void) */ TESTING(" file with committed datatypes"); - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME17, FNAME17OUT, &pack_options) < 0) @@ -1690,7 +1690,7 @@ main(void) /* First run without metadata option. No need to verify the correctness */ /* since this has been verified by earlier tests. Just record the file */ /* size of the output file. */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0) GOERROR; @@ -1701,7 +1701,7 @@ main(void) GOERROR; /* run it again with metadata option */ - if (h5repack_init(&pack_options, 0, FALSE) < 0) + if (h5repack_init(&pack_options, 0, false) < 0) GOERROR; pack_options.meta_block_size = 8192; if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0) @@ -1762,7 +1762,7 @@ make_testfiles(void) hid_t fcpl = H5I_INVALID_HID; /* File creation property list */ hid_t fapl = H5I_INVALID_HID; /* File access property list */ unsigned j; /* Local index variable */ - hbool_t driver_is_parallel; + bool driver_is_parallel; if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0) return -1; @@ -2026,7 +2026,7 @@ make_testfiles(void) /* * #0 -- h5repack_latest.h5 - * default: strategy=FSM_AGGR, persist=FALSE, threshold=1 + * default: strategy=FSM_AGGR, persist=false, threshold=1 * default: inpage=4096 */ j = 0; @@ -2037,7 +2037,7 @@ make_testfiles(void) /* * #1 -- h5repack_default.h5 - * default: strategy=FSM_AGGR, persist=FALSE, threshold=1 + * default: strategy=FSM_AGGR, persist=false, threshold=1 * default: inpage=4096 */ assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); @@ -2050,7 +2050,7 @@ make_testfiles(void) /* * #2 -- h5repack_page_persist.h5 * Setting: - * strategy=PAGE, persist=TRUE, threshold=1 + * strategy=PAGE, persist=true, threshold=1 * inpage=512 * latest format */ @@ -2059,7 +2059,7 @@ make_testfiles(void) return -1; if (H5Pset_file_space_page_size(fcpl, (hsize_t)512) < 0) return -1; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0) return -1; assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0) @@ -2072,13 +2072,13 @@ make_testfiles(void) /* * #3 -- h5repack_fsm_aggr_persist.h5 * Setting: - * strategy=FSM_AGGR, persist=TRUE, threshold=1 + * strategy=FSM_AGGR, persist=true, threshold=1 * default: inpage=4096 */ /* Create file creation property list */ if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) return -1; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) return -1; assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0) @@ -2091,7 +2091,7 @@ make_testfiles(void) /* * #4 -- h5repack_page_threshold.h5 * Setting: - * strategy=PAGE, persist=FALSE, threshold=3 + * strategy=PAGE, persist=false, threshold=3 * inpage=8192 * latest format */ @@ -2099,7 +2099,7 @@ make_testfiles(void) /* Create file creation property list */ if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) return -1; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)3) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)3) < 0) return -1; if (H5Pset_file_space_page_size(fcpl, (hsize_t)8192) < 0) return -1; @@ -2114,14 +2114,14 @@ make_testfiles(void) /* * #5 -- h5repack_fsm_aggr_threshold.h5 * Setting: - * strategy=FSM_AGGR, persist=FALSE, threshold=3 + * strategy=FSM_AGGR, persist=false, threshold=3 * inpage=4096 */ /* Create file creation property list */ if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) return -1; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)3) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, false, (hsize_t)3) < 0) return -1; if (H5Pset_file_space_page_size(fcpl, (hsize_t)FS_PAGESIZE_DEF) < 0) return -1; @@ -2136,14 +2136,14 @@ make_testfiles(void) /* * #6 -- h5repack_aggr.h5 * Setting: - * strategy=AGGR, persist=FALSE, threshold=1 + * strategy=AGGR, persist=false, threshold=1 * latest format */ /* Create file creation property list */ if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) return -1; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, false, (hsize_t)1) < 0) return -1; assert(j < NELMTS(H5REPACK_FSPACE_FNAMES)); if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0) @@ -2157,14 +2157,14 @@ make_testfiles(void) /* * #7 -- h5repack_none.h5 * Setting: - * strategy=NONE, persist=FALSE, threshold=1 + * strategy=NONE, persist=false, threshold=1 * inpage=8192 */ /* Create file creation property list */ if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) return -1; - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1) < 0) return -1; if (H5Pset_file_space_page_size(fcpl, (hsize_t)8192) < 0) return -1; @@ -2788,7 +2788,7 @@ make_nbit(hid_t loc_id) #ifdef H5_HAVE_PARALLEL { - hbool_t driver_is_parallel; + bool driver_is_parallel; /* Set up collective writes for parallel driver */ if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0) @@ -2896,7 +2896,7 @@ make_scaleoffset(hid_t loc_id) #ifdef H5_HAVE_PARALLEL { - hbool_t driver_is_parallel; + bool driver_is_parallel; if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0) goto error; @@ -3005,7 +3005,7 @@ make_all_filters(hid_t loc_id) #ifdef H5_HAVE_PARALLEL { - hbool_t driver_is_parallel; + bool driver_is_parallel; if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0) goto error; @@ -5914,7 +5914,7 @@ make_dset(hid_t loc_id, const char *name, hid_t sid, hid_t dcpl, void *buf) #ifdef H5_HAVE_PARALLEL { - hbool_t driver_is_parallel; + bool driver_is_parallel; if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0) goto out; @@ -5966,7 +5966,7 @@ write_dset(hid_t loc_id, int rank, hsize_t *dims, const char *dset_name, hid_t t if (buf) { #ifdef H5_HAVE_PARALLEL { - hbool_t driver_is_parallel; + bool driver_is_parallel; if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0) goto out; diff --git a/tools/test/misc/clear_open_chk.c b/tools/test/misc/clear_open_chk.c index 3095618..bcf9a42 100644 --- a/tools/test/misc/clear_open_chk.c +++ b/tools/test/misc/clear_open_chk.c @@ -50,7 +50,7 @@ main(int argc, char *argv[]) fname = HDstrdup(argv[1]); /* Try opening the file */ - if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) { + if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, false, NULL, (size_t)0)) < 0) { fprintf(stderr, "clear_open_chk: unable to open the file\n"); free(fname); exit(EXIT_FAILURE); diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c index 5cb7aa2..1698f4a 100644 --- a/tools/test/misc/h5clear_gentest.c +++ b/tools/test/misc/h5clear_gentest.c @@ -64,7 +64,7 @@ gen_cache_image_file(const char *fname) int arr[50][100]; } * buf; /* Buffer for data to write */ H5AC_cache_image_config_t cache_image_config = /* Cache image input configuration */ - {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; + {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, true, false, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; /* Create and fill array */ buf = malloc(sizeof(*buf)); @@ -168,7 +168,7 @@ error: *------------------------------------------------------------------------- */ static int -gen_enhance_files(hbool_t user) +gen_enhance_files(bool user) { hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fcpl = H5I_INVALID_HID; /* File creation property list */ @@ -193,7 +193,7 @@ gen_enhance_files(hbool_t user) } /* Set file space strategy and persisting free-space */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) goto error; /* @@ -383,9 +383,9 @@ main(void) goto error; /* Generate the first 6 files in FILENAME_ENHANCE[] */ - if (gen_enhance_files(FALSE) < 0) + if (gen_enhance_files(false) < 0) goto error; - if (gen_enhance_files(TRUE) < 0) + if (gen_enhance_files(true) < 0) goto error; /* @@ -407,7 +407,7 @@ main(void) * --FILENAME[0]: "h5clear_sec2_v3.h5", "latest_h5clear_sec2_v3.h5" * --FILENAME[1]: "h5clear_log_v3.h5", "latest_h5clear_log_v3.h5" */ - for (new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = false; new_format <= true; new_format++) { hid_t fapl2, my_fapl; /* File access property lists */ /* Set to use the appropriate file access property list */ @@ -559,7 +559,7 @@ main(void) goto error; /* Set file space strategy and persisting free-space */ - if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0) goto error; /* Create the file with the set file space info */ diff --git a/tools/test/misc/vds/UC_common.h b/tools/test/misc/vds/UC_common.h index 234ec87..4cfce35 100644 --- a/tools/test/misc/vds/UC_common.h +++ b/tools/test/misc/vds/UC_common.h @@ -26,10 +26,6 @@ /* Compression level */ #define COMPRESSION_LEVEL 7 -/* Booleans */ -#define TRUE 1 -#define FALSE 0 - /* Testing macros */ #define AT() printf(" at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); #define UC_ERROR \ diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c index 90d5897..00a35bb 100644 --- a/tools/test/perform/overhead.c +++ b/tools/test/perform/overhead.c @@ -40,12 +40,12 @@ #endif #define FILE_NAME_1 "overhead.h5" -#ifndef FALSE -#define FALSE 0 -#endif /* FALSE */ -#ifndef TRUE -#define TRUE 1 -#endif /* TRUE */ +#ifndef false +#define false 0 +#endif /* false */ +#ifndef true +#define true 1 +#endif /* true */ typedef enum fill_t { FILL_ALL, FILL_FORWARD, FILL_REVERSE, FILL_INWARD, FILL_OUTWARD, FILL_RANDOM } fill_t; @@ -142,7 +142,7 @@ display_error_cb(hid_t estack, void H5_ATTR_UNUSED *client_data) *------------------------------------------------------------------------- */ static int -test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc) +test(fill_t fill_style, const double splits[], bool verbose, bool use_rdcc) { hid_t file = (-1), fapl = (-1), dcpl = (-1), xfer = (-1), mspace = (-1), fspace = (-1), dset = (-1); hsize_t ch_size[1] = {1}; /*chunk size */ @@ -312,11 +312,11 @@ error: int main(int argc, char *argv[]) { - hid_t xfer; - fill_t fill_style = FILL_ALL; - hbool_t use_cache = FALSE; - double splits[3]; - int i, j, nerrors = 0; + hid_t xfer; + fill_t fill_style = FILL_ALL; + bool use_cache = false; + double splits[3]; + int i, j, nerrors = 0; /* Default split ratios */ H5Eset_auto2(H5E_DEFAULT, display_error_cb, NULL); @@ -346,7 +346,7 @@ main(int argc, char *argv[]) fill_style = FILL_RANDOM; } else if (!strcmp(argv[i], "cache")) { - use_cache = TRUE; + use_cache = true; } else if (j < 3 && (isdigit(argv[i][0]) || '.' == argv[i][0])) { splits[j++] = strtod(argv[i], NULL); @@ -359,16 +359,16 @@ main(int argc, char *argv[]) if (FILL_ALL == fill_style) { printf("%-7s %8s\n", "Style", "Bytes/Chunk"); printf("%-7s %8s\n", "-----", "-----------"); - nerrors += test(FILL_FORWARD, splits, FALSE, use_cache); - nerrors += test(FILL_REVERSE, splits, FALSE, use_cache); - nerrors += test(FILL_INWARD, splits, FALSE, use_cache); - nerrors += test(FILL_OUTWARD, splits, FALSE, use_cache); - nerrors += test(FILL_RANDOM, splits, FALSE, use_cache); + nerrors += test(FILL_FORWARD, splits, false, use_cache); + nerrors += test(FILL_REVERSE, splits, false, use_cache); + nerrors += test(FILL_INWARD, splits, false, use_cache); + nerrors += test(FILL_OUTWARD, splits, false, use_cache); + nerrors += test(FILL_RANDOM, splits, false, use_cache); } else { if (use_cache) usage(argv[0]); - nerrors += test(fill_style, splits, TRUE, FALSE); + nerrors += test(fill_style, splits, true, false); } if (nerrors > 0) goto error; diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c index 16df60a..6762f7c 100644 --- a/tools/test/perform/perf_meta.c +++ b/tools/test/perform/perf_meta.c @@ -33,13 +33,13 @@ static int TEST_3 = 0x4; /* Test 3 */ static const char *FILENAME[] = {"meta_perf_1", "meta_perf_2", "meta_perf_3", NULL}; /* Default values for performance. Can be changed through command line options */ -static int NUM_DSETS = 16; -static int NUM_ATTRS = 8; -static int BATCH_ATTRS = 2; -static hbool_t flush_dset = FALSE; -static hbool_t flush_attr = FALSE; -static int nerrors = 0; /* errors count */ -static hid_t fapl; +static int NUM_DSETS = 16; +static int NUM_ATTRS = 8; +static int BATCH_ATTRS = 2; +static bool flush_dset = false; +static bool flush_attr = false; +static int nerrors = 0; /* errors count */ +static hid_t fapl; /* Data space IDs */ static hid_t space; @@ -117,9 +117,9 @@ parse_options(int argc, char **argv) case 'f': /* Call H5Fflush for each dataset or attribute */ if (!strcmp("a", (*argv + 2))) - flush_attr = TRUE; + flush_attr = true; else if (!strcmp("d", (*argv + 2))) - flush_dset = TRUE; + flush_dset = true; else { nerrors++; return (1); diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c index b8b80e8..61bb6c0 100644 --- a/tools/test/perform/zip_perf.c +++ b/tools/test/perform/zip_perf.c @@ -36,13 +36,13 @@ /* report 0.0 in case t is zero too */ #define MB_PER_SEC(bytes, t) ((fabs(t) < 0.0000000001) ? 0.0 : ((((double)(bytes)) / (double)ONE_MB) / (t))) -#ifndef TRUE -#define TRUE 1 -#endif /* TRUE */ +#ifndef true +#define true 1 +#endif /* true */ -#ifndef FALSE -#define FALSE (!TRUE) -#endif /* FALSE */ +#ifndef false +#define false (!true) +#endif /* false */ #ifndef S_IRWXU #define S_IRWXU (_S_IREAD | _S_IWRITE) @@ -54,7 +54,7 @@ static const char *option_prefix = NULL; static char *filename = NULL; static int compress_percent = 0; static int compress_level = Z_DEFAULT_COMPRESSION; -static int output, random_test = FALSE; +static int output, random_test = false; static int report_once_flag; static double compression_time; @@ -500,7 +500,7 @@ main(int argc, char *argv[]) option_prefix = H5_optarg; break; case 'r': - random_test = TRUE; + random_test = true; break; case 's': file_size = parse_size_directive(H5_optarg); |