diff options
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/h5diff.c | 24 | ||||
-rw-r--r-- | tools/lib/h5diff.h | 8 | ||||
-rw-r--r-- | tools/lib/h5diff_array.c | 132 | ||||
-rw-r--r-- | tools/lib/h5diff_attr.c | 16 | ||||
-rw-r--r-- | tools/lib/h5diff_dset.c | 8 | ||||
-rw-r--r-- | tools/lib/h5tools.c | 162 | ||||
-rw-r--r-- | tools/lib/h5tools.h | 46 | ||||
-rw-r--r-- | tools/lib/h5tools_dump.c | 422 | ||||
-rw-r--r-- | tools/lib/h5tools_dump.h | 64 | ||||
-rw-r--r-- | tools/lib/h5tools_error.h | 2 | ||||
-rw-r--r-- | tools/lib/h5tools_ref.c | 2 | ||||
-rw-r--r-- | tools/lib/h5tools_str.c | 16 | ||||
-rw-r--r-- | tools/lib/h5tools_utils.c | 24 | ||||
-rw-r--r-- | tools/lib/h5tools_utils.h | 6 | ||||
-rw-r--r-- | tools/lib/h5trav.c | 30 | ||||
-rw-r--r-- | tools/lib/h5trav.h | 18 |
16 files changed, 490 insertions, 490 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 502b2ec..b607197 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -508,7 +508,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata) } else if (ret_value == 0) { /* no dangling link option given and detect dangling link */ - tinfo->symlink_visited.dangle_link = TRUE; + tinfo->symlink_visited.dangle_link = true; trav_info_visit_lnk(path, linfo, tinfo); if (opts->no_dangle_links) opts->err_stat = H5DIFF_ERR; /* make dangling link is error */ @@ -523,7 +523,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata) if (symlink_visit_add(&(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path) < 0) H5TOOLS_GOTO_DONE(SUCCEED); - if (h5trav_visit(tinfo->fid, path, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, tinfo, + if (h5trav_visit(tinfo->fid, path, true, true, trav_grp_objs, trav_grp_symlinks, tinfo, H5O_INFO_BASIC) < 0) { parallel_print("Error: Could not get file contents\n"); opts->err_stat = H5DIFF_ERR; @@ -537,7 +537,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata) } else if (ret_value == 0) { /* no dangling link option given and detect dangling link */ - tinfo->symlink_visited.dangle_link = TRUE; + tinfo->symlink_visited.dangle_link = true; trav_info_visit_lnk(path, linfo, tinfo); if (opts->no_dangle_links) opts->err_stat = H5DIFF_ERR; /* make dangling link is error */ @@ -555,7 +555,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata) if (symlink_visit_add(&(tinfo->symlink_visited), linfo->type, ext_fname, ext_path) < 0) H5TOOLS_GOTO_DONE(SUCCEED); - if (h5trav_visit(tinfo->fid, path, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, tinfo, + if (h5trav_visit(tinfo->fid, path, true, true, trav_grp_objs, trav_grp_symlinks, tinfo, H5O_INFO_BASIC) < 0) { parallel_print("Error: Could not get file contents\n"); opts->err_stat = H5DIFF_ERR; @@ -961,7 +961,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char both_objs_grp = (obj1type == H5TRAV_TYPE_GROUP && obj2type == H5TRAV_TYPE_GROUP); if (both_objs_grp) { - H5TOOLS_DEBUG("h5diff both_objs_grp TRUE"); + H5TOOLS_DEBUG("h5diff both_objs_grp true"); /* * traverse group1 */ @@ -969,7 +969,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char /* optional data pass */ info1_grp->opts = (diff_opt_t *)opts; - if (h5trav_visit(file1_id, obj1fullname, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, info1_grp, + if (h5trav_visit(file1_id, obj1fullname, true, true, trav_grp_objs, trav_grp_symlinks, info1_grp, H5O_INFO_BASIC) < 0) { parallel_print("Error: Could not get file contents\n"); H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Could not get file contents"); @@ -983,7 +983,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char /* optional data pass */ info2_grp->opts = (diff_opt_t *)opts; - if (h5trav_visit(file2_id, obj2fullname, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, info2_grp, + if (h5trav_visit(file2_id, obj2fullname, true, true, trav_grp_objs, trav_grp_symlinks, info2_grp, H5O_INFO_BASIC) < 0) { parallel_print("Error: Could not get file contents\n"); H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Could not get file contents"); @@ -1534,9 +1534,9 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_ hid_t type2_id = H5I_INVALID_HID; hid_t grp1_id = H5I_INVALID_HID; hid_t grp2_id = H5I_INVALID_HID; - hbool_t is_dangle_link1 = FALSE; - hbool_t is_dangle_link2 = FALSE; - hbool_t is_hard_link = FALSE; + bool is_dangle_link1 = false; + bool is_dangle_link2 = false; + bool is_hard_link = false; hsize_t nfound = 0; h5trav_type_t object_type; diff_err_t ret_value = opts->err_stat; @@ -1577,7 +1577,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_ H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "dangling link is error"); } else - is_dangle_link1 = TRUE; + is_dangle_link1 = true; } /* target object2 - get type and name */ @@ -1592,7 +1592,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_ H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "dangling link is error"); } else - is_dangle_link2 = TRUE; + is_dangle_link2 = true; } /* found dangling link */ diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h index d16c855..12bf56a 100644 --- a/tools/lib/h5diff.h +++ b/tools/lib/h5diff.h @@ -27,7 +27,7 @@ *------------------------------------------------------------------------*/ typedef struct { h5trav_type_t type[2]; - hbool_t is_same_trgobj; + bool is_same_trgobj; } diff_args_t; /*------------------------------------------------------------------------- * command line options @@ -61,7 +61,7 @@ typedef struct { int use_system_epsilon; /* flag to use system epsilon (1 or 0) */ int percent_bool; /* relative error to compare*/ double percent; /* relative error value */ - hbool_t follow_links; /* follow symbolic links */ + bool follow_links; /* follow symbolic links */ int no_dangle_links; /* return error when find dangling link */ int cmn_objs; /* do we have common objects */ int not_cmp; /* are the objects comparable */ @@ -90,8 +90,8 @@ typedef struct { struct subset_t *sset[2]; /* subsetting parameters */ h5tools_vol_info_t vol_info[2]; /* VOL information for input file, output file */ h5tools_vfd_info_t vfd_info[2]; /* VFD information for input file, output file */ - hbool_t custom_vol[2]; /* Using a custom input, output VOL? */ - hbool_t custom_vfd[2]; /* Using a custom input, output VFD? */ + bool custom_vol[2]; /* Using a custom input, output VOL? */ + bool custom_vfd[2]; /* Using a custom input, output VFD? */ } diff_opt_t; /*------------------------------------------------------------------------- diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index abb81b9..c0430bc 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -80,32 +80,32 @@ *------------------------------------------------------------------------- */ -static hbool_t not_comparable; +static bool not_comparable; #define PER(A, B) \ do { \ per = -1; \ - not_comparable = FALSE; \ - both_zero = FALSE; \ + not_comparable = false; \ + both_zero = false; \ if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B))) \ - both_zero = TRUE; \ + both_zero = true; \ if (!H5_DBL_ABS_EQUAL(0, (double)(A))) \ per = (double)ABS((double)((B) - (A)) / (double)(A)); \ else \ - not_comparable = TRUE; \ + not_comparable = true; \ } while (0) #define PER_UNSIGN(TYPE, A, B) \ do { \ per = -1; \ - not_comparable = FALSE; \ - both_zero = FALSE; \ + not_comparable = false; \ + both_zero = false; \ if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B))) \ - both_zero = TRUE; \ + both_zero = true; \ if (!H5_DBL_ABS_EQUAL(0, (double)(A))) \ per = ABS((double)((TYPE)((B) - (A))) / (double)(A)); \ else \ - not_comparable = TRUE; \ + not_comparable = true; \ } while (0) #define PDIFF(a, b) (((b) > (a)) ? ((b) - (a)) : ((a) - (b))) @@ -121,14 +121,14 @@ typedef struct mcomp_t { * local prototypes *------------------------------------------------------------------------- */ -static hbool_t all_zero(const void *_mem, size_t size); +static bool all_zero(const void *_mem, size_t size); static int ull2float(unsigned long long ull_value, float *f_value); static hsize_t character_compare(char *mem1, char *mem2, hsize_t elemtno, size_t u, diff_opt_t *opts); static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t elemtno, diff_opt_t *opts); -static hbool_t equal_float(float value, float expected, diff_opt_t *opts); -static hbool_t equal_double(double value, double expected, diff_opt_t *opts); -static hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *opts); +static bool equal_float(float value, float expected, diff_opt_t *opts); +static bool equal_double(double value, double expected, diff_opt_t *opts); +static bool equal_ldouble(long double value, long double expected, diff_opt_t *opts); static int print_data(diff_opt_t *opts); static void print_pos(diff_opt_t *opts, hsize_t elemtno, size_t u); @@ -444,8 +444,8 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co unsigned nmembs; unsigned j; size_t size = 0; - hbool_t iszero1; - hbool_t iszero2; + bool iszero1; + bool iszero2; hsize_t nfound = 0; /* differences found */ diff_err_t ret_value = opts->err_stat; @@ -1270,20 +1270,20 @@ done: * * Purpose: Determines if memory is initialized to all zero bytes. * - * Return: TRUE if all bytes are zero; FALSE otherwise + * Return: true if all bytes are zero; false otherwise *------------------------------------------------------------------------- */ -static hbool_t +static bool all_zero(const void *_mem, size_t size) { const unsigned char *mem = (const unsigned char *)_mem; while (size-- > 0) if (mem[size]) - return FALSE; + return false; - return TRUE; + return true; } /*------------------------------------------------------------------------- @@ -1592,7 +1592,7 @@ character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t elemtno, hsize_t nfound = 0; /* differences found */ unsigned char temp1_uchar; unsigned char temp2_uchar; - hbool_t both_zero = FALSE; + bool both_zero = false; double per; /* both_zero is set in the PER_UNSIGN macro but not used in this function */ @@ -1667,9 +1667,9 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d float temp1_float; float temp2_float; double per; - hbool_t both_zero = FALSE; - hbool_t isnan1 = FALSE; - hbool_t isnan2 = FALSE; + bool both_zero = false; + bool isnan1 = false; + bool isnan2 = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -1817,7 +1817,7 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d *------------------------------------------------------------------------- */ else { - if (equal_float(temp1_float, temp2_float, opts) == FALSE) { + if (equal_float(temp1_float, temp2_float, opts) == false) { opts->print_percentage = 0; print_pos(opts, elem_idx, 0); if (print_data(opts)) { @@ -1847,9 +1847,9 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, double temp1_double; double temp2_double; double per; - hbool_t both_zero = FALSE; - hbool_t isnan1 = FALSE; - hbool_t isnan2 = FALSE; + bool both_zero = false; + bool isnan1 = false; + bool isnan2 = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -1990,7 +1990,7 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, *------------------------------------------------------------------------- */ else { - if (equal_double(temp1_double, temp2_double, opts) == FALSE) { + if (equal_double(temp1_double, temp2_double, opts) == false) { opts->print_percentage = 0; print_pos(opts, elem_idx, 0); if (print_data(opts)) { @@ -2020,9 +2020,9 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, long double temp1_double; long double temp2_double; double per; - hbool_t both_zero = FALSE; - hbool_t isnan1 = FALSE; - hbool_t isnan2 = FALSE; + bool both_zero = false; + bool isnan1 = false; + bool isnan2 = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2164,7 +2164,7 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, * no -d and -p *------------------------------------------------------------------------- */ - else if (equal_ldouble(temp1_double, temp2_double, opts) == FALSE) { + else if (equal_ldouble(temp1_double, temp2_double, opts) == false) { opts->print_percentage = 0; print_pos(opts, elem_idx, 0); if (print_data(opts)) { @@ -2193,7 +2193,7 @@ diff_schar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d char temp1_char; char temp2_char; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); memcpy(&temp1_char, mem1, sizeof(char)); @@ -2281,7 +2281,7 @@ diff_uchar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d unsigned char temp1_uchar; unsigned char temp2_uchar; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2369,7 +2369,7 @@ diff_short_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d short temp1_short; short temp2_short; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2457,7 +2457,7 @@ diff_ushort_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, unsigned short temp1_ushort; unsigned short temp2_ushort; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2549,7 +2549,7 @@ diff_int_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, dif int temp1_int; int temp2_int; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2637,7 +2637,7 @@ diff_uint_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, di unsigned int temp1_uint; unsigned int temp2_uint; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2725,7 +2725,7 @@ diff_long_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, di long temp1_long; long temp2_long; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2813,7 +2813,7 @@ diff_ulong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d unsigned long temp1_ulong; unsigned long temp2_ulong; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2903,7 +2903,7 @@ diff_llong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d long long temp1_llong; long long temp2_llong; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -2997,7 +2997,7 @@ diff_ullong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, unsigned long long temp2_ullong; float f1, f2; double per; - hbool_t both_zero = FALSE; + bool both_zero = false; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); @@ -3132,7 +3132,7 @@ done: * Purpose: use a absolute error formula to deal with floating point uncertainty *------------------------------------------------------------------------- */ -static hbool_t +static bool equal_double(double value, double expected, diff_opt_t *opts) { if (opts->do_nans) { @@ -3140,36 +3140,36 @@ equal_double(double value, double expected, diff_opt_t *opts) * detect NaNs *------------------------------------------------------------------------- */ - hbool_t isnan1 = HDisnan(value); - hbool_t isnan2 = HDisnan(expected); + bool isnan1 = HDisnan(value); + bool isnan2 = HDisnan(expected); /*------------------------------------------------------------------------- * we consider NaN == NaN to be true *------------------------------------------------------------------------- */ if (isnan1 && isnan2) - return TRUE; + return true; /*------------------------------------------------------------------------- * one is a NaN, do not compare but assume difference *------------------------------------------------------------------------- */ if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) - return FALSE; + return false; } if (opts->use_system_epsilon) { /* Check equality within some epsilon */ if (H5_DBL_ABS_EQUAL(value, expected)) - return TRUE; + return true; } else { /* Check bits */ if (!memcmp(&value, &expected, sizeof(double))) - return TRUE; + return true; } - return FALSE; + return false; } /*------------------------------------------------------------------------- @@ -3179,7 +3179,7 @@ equal_double(double value, double expected, diff_opt_t *opts) *------------------------------------------------------------------------- */ -static hbool_t +static bool equal_ldouble(long double value, long double expected, diff_opt_t *opts) { if (opts->do_nans) { @@ -3187,36 +3187,36 @@ equal_ldouble(long double value, long double expected, diff_opt_t *opts) * detect NaNs *------------------------------------------------------------------------- */ - hbool_t isnan1 = HDisnan(value); - hbool_t isnan2 = HDisnan(expected); + bool isnan1 = HDisnan(value); + bool isnan2 = HDisnan(expected); /*------------------------------------------------------------------------- * we consider NaN == NaN to be true *------------------------------------------------------------------------- */ if (isnan1 && isnan2) - return TRUE; + return true; /*------------------------------------------------------------------------- * one is a NaN, do not compare but assume difference *------------------------------------------------------------------------- */ if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) - return FALSE; + return false; } if (opts->use_system_epsilon) { /* Check equality within some epsilon */ if (H5_LDBL_ABS_EQUAL(value, expected)) - return TRUE; + return true; } else { /* Check bits */ if (!memcmp(&value, &expected, sizeof(long double))) - return TRUE; + return true; } - return FALSE; + return false; } /*------------------------------------------------------------------------- @@ -3225,7 +3225,7 @@ equal_ldouble(long double value, long double expected, diff_opt_t *opts) * Purpose: use a absolute error formula to deal with floating point uncertainty *------------------------------------------------------------------------- */ -static hbool_t +static bool equal_float(float value, float expected, diff_opt_t *opts) { if (opts->do_nans) { @@ -3233,36 +3233,36 @@ equal_float(float value, float expected, diff_opt_t *opts) * detect NaNs *------------------------------------------------------------------------- */ - hbool_t isnan1 = HDisnan(value); - hbool_t isnan2 = HDisnan(expected); + bool isnan1 = HDisnan(value); + bool isnan2 = HDisnan(expected); /*------------------------------------------------------------------------- * we consider NaN == NaN to be true *------------------------------------------------------------------------- */ if (isnan1 && isnan2) - return TRUE; + return true; /*------------------------------------------------------------------------- * one is a NaN, do not compare but assume difference *------------------------------------------------------------------------- */ if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) - return FALSE; + return false; } if (opts->use_system_epsilon) { /* Check equality within some epsilon */ if (H5_FLT_ABS_EQUAL(value, expected)) - return TRUE; + return true; } else { /* Check bits */ if (!memcmp(&value, &expected, sizeof(float))) - return TRUE; + return true; } - return FALSE; + return false; } /*------------------------------------------------------------------------- diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 0c377af..12abd28 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -326,8 +326,8 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na size_t msize2; /* memory size of memory type */ void *buf1 = NULL; /* data buffer */ void *buf2 = NULL; /* data buffer */ - hbool_t buf1hasdata = FALSE; /* buffer has data */ - hbool_t buf2hasdata = FALSE; /* buffer has data */ + bool buf1hasdata = false; /* buffer has data */ + bool buf2hasdata = false; /* buffer has data */ int rank1; /* rank of dataset */ int rank2; /* rank of dataset */ hsize_t dims1[H5S_MAX_RANK]; /* dimensions of dataset */ @@ -443,7 +443,7 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Aget_type first attribute failed"); } else - buf1hasdata = TRUE; + buf1hasdata = true; H5TOOLS_DEBUG("attr H5Aread 1"); if (H5Aread(attr2_id, mtype2_id, buf2) < 0) { @@ -451,7 +451,7 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Aget_type second attribute failed"); } else - buf2hasdata = TRUE; + buf2hasdata = true; H5TOOLS_DEBUG("attr H5Aread 2"); /* format output string */ @@ -530,12 +530,12 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na /* Free buf1 and buf2, check both VLEN-data VLEN-string to reclaim any * VLEN memory first */ - if (TRUE == h5tools_detect_vlen(mtype1_id)) + if (true == h5tools_detect_vlen(mtype1_id)) H5Treclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1); free(buf1); buf1 = NULL; - if (TRUE == h5tools_detect_vlen(mtype2_id)) + if (true == h5tools_detect_vlen(mtype2_id)) H5Treclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2); free(buf2); buf2 = NULL; @@ -559,12 +559,12 @@ done: H5E_BEGIN_TRY { if (buf1) { - if (buf1hasdata && TRUE == h5tools_detect_vlen(mtype1_id)) + if (buf1hasdata && true == h5tools_detect_vlen(mtype1_id)) H5Treclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1); free(buf1); } /* end if */ if (buf2) { - if (buf2hasdata && TRUE == h5tools_detect_vlen(mtype2_id)) + if (buf2hasdata && true == h5tools_detect_vlen(mtype2_id)) H5Treclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2); free(buf2); } /* end if */ diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 78f52bc..8ab9db1 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -351,10 +351,10 @@ diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_n /* Check if type is either VLEN-data or VLEN-string to reclaim any * VLEN memory buffer later */ - if (TRUE == h5tools_detect_vlen(m_tid1)) - vl_data1 = TRUE; - if (TRUE == h5tools_detect_vlen(m_tid2)) - vl_data2 = TRUE; + if (true == h5tools_detect_vlen(m_tid1)) + vl_data1 = true; + if (true == h5tools_detect_vlen(m_tid2)) + vl_data2 = true; H5TOOLS_DEBUG("h5tools_detect_vlen %d:%d - errstat:%d", vl_data1, vl_data2, opts->err_stat); /*------------------------------------------------------------------------ diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 0e063c7..c3bfbd6 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -522,7 +522,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info) } else if (!HDstrcmp(vfd_info->u.name, drivernames[CORE_VFD_IDX])) { /* Core Driver */ - if (H5Pset_fapl_core(fapl_id, (size_t)H5_MB, TRUE) < 0) + if (H5Pset_fapl_core(fapl_id, (size_t)H5_MB, true) < 0) H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_core failed"); } else if (!HDstrcmp(vfd_info->u.name, drivernames[FAMILY_VFD_IDX])) { @@ -540,7 +540,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info) } else if (!HDstrcmp(vfd_info->u.name, drivernames[MULTI_VFD_IDX])) { /* MULTI Driver */ - if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, TRUE) < 0) + if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, true) < 0) H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_multi failed"); } else if (!HDstrcmp(vfd_info->u.name, drivernames[MPIO_VFD_IDX])) { @@ -822,9 +822,9 @@ done: herr_t h5tools_get_vfd_name(hid_t fid, hid_t fapl_id, char *drivername, size_t drivername_size) { - hid_t fapl_vol_id = H5I_INVALID_HID; - hbool_t is_native = FALSE; - herr_t ret_value = SUCCEED; + hid_t fapl_vol_id = H5I_INVALID_HID; + bool is_native = false; + herr_t ret_value = SUCCEED; if (fapl_id < 0) H5TOOLS_GOTO_ERROR(FAIL, "invalid FAPL"); @@ -915,14 +915,14 @@ done: * * The 'use_specific_driver' parameter is used to control the * VFD/VOL connector that this routine uses to open the file - * with. If 'use_specific_driver' is set to TRUE, this routine + * with. If 'use_specific_driver' is set to true, this routine * assumes that the caller has already set a specific VFD or VOL * connector on the given FAPL and will attempt to directly use * the FAPL for opening the file. We assume that the caller knows * what they are doing; if the file is unable to be opened using * that FAPL, this routine will return H5I_INVALID_HID. * - * However, if 'use_specific_driver' is set to FALSE, this + * However, if 'use_specific_driver' is set to false, this * routine assumes that the caller HAS NOT set a specific VFD or * VOL connector on the given FAPL and will instead loop through * the various available VFL drivers and VOL connectors trying to @@ -951,7 +951,7 @@ done: *------------------------------------------------------------------------- */ hid_t -h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_specific_driver, char *drivername, +h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, bool use_specific_driver, char *drivername, size_t drivername_size) { hid_t fid = H5I_INVALID_HID; @@ -989,7 +989,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec /* * If we failed to open the file and the caller specified 'use_specific_driver' - * as TRUE, we should return failure now since the file couldn't be opened with + * as true, we should return failure now since the file couldn't be opened with * the VFL driver/VOL connector that was set on the FAPL by the caller. */ if (use_specific_driver) @@ -1037,7 +1037,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec /* Can we open the file with this combo? */ H5E_BEGIN_TRY { - fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size); + fid = h5tools_fopen(fname, flags, tmp_fapl_id, true, drivername, drivername_size); } H5E_END_TRY @@ -1060,7 +1060,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec continue; /* Can we open the file with this connector? */ - if ((fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size)) >= 0) { + if ((fid = h5tools_fopen(fname, flags, tmp_fapl_id, true, drivername, drivername_size)) >= 0) { used_fapl_id = tmp_fapl_id; H5TOOLS_GOTO_DONE(fid); } @@ -1121,24 +1121,24 @@ h5tools_count_ncols(const char *s) * * Purpose: Recursive check for any variable length data in given type. * - * Return: TRUE : type contains any variable length data - * FALSE : type doesn't contain any variable length data + * Return: true : type contains any variable length data + * false : type doesn't contain any variable length data * Negative value: failed *------------------------------------------------------------------------- */ htri_t h5tools_detect_vlen(hid_t tid) { - htri_t ret = FALSE; + htri_t ret = false; /* recursive detect any vlen data values in type (compound, array ...) */ ret = H5Tdetect_class(tid, H5T_VLEN); - if ((ret == TRUE) || (ret < 0)) + if ((ret == true) || (ret < 0)) goto done; /* recursive detect any vlen string in type (compound, array ...) */ ret = h5tools_detect_vlen_str(tid); - if ((ret == TRUE) || (ret < 0)) + if ((ret == true) || (ret < 0)) goto done; done: @@ -1150,8 +1150,8 @@ done: * * Purpose: Recursive check for variable length string of a datatype. * - * Return: TRUE : type contains any variable length string - * FALSE : type doesn't contain any variable length string + * Return: true : type contains any variable length string + * false : type doesn't contain any variable length string * Negative value: failed *------------------------------------------------------------------------- */ @@ -1159,10 +1159,10 @@ htri_t h5tools_detect_vlen_str(hid_t tid) { H5T_class_t tclass = -1; - htri_t ret = FALSE; + htri_t ret = false; ret = H5Tis_variable_str(tid); - if ((ret == TRUE) || (ret < 0)) + if ((ret == true) || (ret < 0)) goto done; tclass = H5Tget_class(tid); @@ -1174,7 +1174,7 @@ h5tools_detect_vlen_str(hid_t tid) goto done; } ret = h5tools_detect_vlen_str(btid); - if ((ret == TRUE) || (ret < 0)) { + if ((ret == true) || (ret < 0)) { H5Tclose(btid); goto done; } @@ -1194,7 +1194,7 @@ h5tools_detect_vlen_str(hid_t tid) hid_t mtid = H5Tget_member_type(tid, u); ret = h5tools_detect_vlen_str(mtid); - if ((ret == TRUE) || (ret < 0)) { + if ((ret == true) || (ret < 0)) { H5Tclose(mtid); goto done; } @@ -1411,16 +1411,16 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_ * hsize_t elmt_count is the data element loop counter *------------------------------------------------------------------------- */ -hbool_t +bool h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t local_elmt_counter, hsize_t elmt_counter) { - hbool_t dimension_break = TRUE; - char *s = NULL; - char *section = NULL; /* a section of output */ - int secnum; /* section sequence number */ - int multiline; /* datum was multiline */ + bool dimension_break = true; + char *s = NULL; + char *section = NULL; /* a section of output */ + int secnum; /* section sequence number */ + int multiline; /* datum was multiline */ if (stream == NULL) return dimension_break; @@ -1443,7 +1443,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex * ... and the previous element also occupied more than one * line, then start this element at the beginning of a line. */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; } else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) <= ncols) { @@ -1452,7 +1452,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex * should end the current line and start this element on its * own line. */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; } H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix); } @@ -1464,11 +1464,11 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex */ if (info->arr_linebreak && ctx->cur_elmt) { if (ctx->size_last_dim && (ctx->cur_elmt % ctx->size_last_dim) == 0) - ctx->need_prefix = TRUE; + ctx->need_prefix = true; if (elmt_counter == ctx->size_last_dim) { - ctx->need_prefix = TRUE; - dimension_break = FALSE; + ctx->need_prefix = true; + dimension_break = false; } H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix); } @@ -1483,7 +1483,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex if (info->line_multi_new == 1 && ctx->prev_multiline && (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) > ncols) - ctx->need_prefix = TRUE; + ctx->need_prefix = true; H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix); /* @@ -1491,7 +1491,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex * start a new line. */ if (info->line_per_line > 0 && ctx->cur_elmt >= info->line_per_line) - ctx->need_prefix = TRUE; + ctx->need_prefix = true; H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix); /* @@ -1576,16 +1576,16 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex * hsize_t elmt_count is the data element loop counter *------------------------------------------------------------------------- */ -hbool_t +bool h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t *ptdata, hsize_t local_elmt_counter, hsize_t elmt_counter) { - hbool_t dimension_break = TRUE; - char *s = NULL; - char *section = NULL; /* a section of output */ - int secnum; /* section sequence number */ - int multiline; /* datum was multiline */ + bool dimension_break = true; + char *s = NULL; + char *section = NULL; /* a section of output */ + int secnum; /* section sequence number */ + int multiline; /* datum was multiline */ H5TOOLS_START_DEBUG(" "); H5TOOLS_DEBUG("elmt_counter=%ld - local_elmt_counter=%ld", elmt_counter, local_elmt_counter); @@ -1604,7 +1604,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools * ... and the previous element also occupied more than one * line, then start this element at the beginning of a line. */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; } else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) <= ncols) { @@ -1613,7 +1613,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools * should end the current line and start this element on its * own line. */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; } } @@ -1624,11 +1624,11 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools */ if (info->arr_linebreak && ctx->cur_elmt) { if (ctx->size_last_dim && (ctx->cur_elmt % ctx->size_last_dim) == 0) - ctx->need_prefix = TRUE; + ctx->need_prefix = true; if (elmt_counter == ctx->size_last_dim) { - ctx->need_prefix = TRUE; - dimension_break = FALSE; + ctx->need_prefix = true; + dimension_break = false; } } @@ -1640,14 +1640,14 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools if (info->line_multi_new == 1 && ctx->prev_multiline && (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) + HDstrlen(OPT(info->line_suf, ""))) > ncols) - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* * If too many elements have already been printed then we need to * start a new line. */ if (info->line_per_line > 0 && ctx->cur_elmt >= info->line_per_line) - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* * Each OPTIONAL_LINE_BREAK embedded in the rendered string can cause @@ -1788,7 +1788,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t size_t size; /* datum size */ hsize_t block_index; H5T_class_t type_class; - hbool_t past_catch = FALSE; + bool past_catch = false; int ret_value = 0; H5TOOLS_START_DEBUG(" "); @@ -2036,7 +2036,7 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t contai size_t type_size; hid_t mem_space = H5I_INVALID_HID; void *region_buf = NULL; - hbool_t past_catch = FALSE; + bool past_catch = false; hsize_t blkndx; hid_t sid1 = H5I_INVALID_HID; int ret_value = -1; @@ -2121,7 +2121,7 @@ done:; * True otherwise *------------------------------------------------------------------------- */ -hbool_t +bool render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream, hid_t container) { hssize_t snblocks; @@ -2132,30 +2132,30 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *strea unsigned ndims; hid_t dtype = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - hbool_t past_catch = FALSE; - hbool_t ret_value = TRUE; + bool past_catch = false; + bool ret_value = true; H5TOOLS_START_DEBUG(" "); if ((snblocks = H5Sget_select_hyper_nblocks(region_space)) <= 0) - H5TOOLS_THROW(FALSE, "H5Sget_select_hyper_nblocks failed"); + H5TOOLS_THROW(false, "H5Sget_select_hyper_nblocks failed"); nblocks = (hsize_t)snblocks; /* Print block information */ if ((sndims = H5Sget_simple_extent_ndims(region_space)) < 0) - H5TOOLS_THROW(FALSE, "H5Sget_simple_extent_ndims failed"); + H5TOOLS_THROW(false, "H5Sget_simple_extent_ndims failed"); ndims = (unsigned)sndims; alloc_size = nblocks * ndims * 2 * sizeof(ptdata[0]); if ((ptdata = (hsize_t *)malloc((size_t)alloc_size)) == NULL) - H5TOOLS_GOTO_ERROR(FALSE, "Could not allocate buffer for ptdata"); + H5TOOLS_GOTO_ERROR(false, "Could not allocate buffer for ptdata"); if (H5Sget_select_hyper_blocklist(region_space, (hsize_t)0, nblocks, ptdata) < 0) - H5TOOLS_GOTO_ERROR(FALSE, "H5Rget_select_hyper_blocklist failed"); + H5TOOLS_GOTO_ERROR(false, "H5Rget_select_hyper_blocklist failed"); if ((dtype = H5Dget_type(region_id)) < 0) - H5TOOLS_GOTO_ERROR(FALSE, "H5Dget_type failed"); + H5TOOLS_GOTO_ERROR(false, "H5Dget_type failed"); if ((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) - H5TOOLS_GOTO_ERROR(FALSE, "H5Tget_native_type failed"); + H5TOOLS_GOTO_ERROR(false, "H5Tget_native_type failed"); render_bin_output_region_data_blocks(region_id, stream, container, ndims, type_id, nblocks, ptdata); @@ -2163,12 +2163,12 @@ done: free(ptdata); if (type_id > 0 && H5Tclose(type_id) < 0) - H5TOOLS_ERROR(FALSE, "H5Tclose failed"); + H5TOOLS_ERROR(false, "H5Tclose failed"); if (dtype > 0 && H5Tclose(dtype) < 0) - H5TOOLS_ERROR(FALSE, "H5Tclose failed"); + H5TOOLS_ERROR(false, "H5Tclose failed"); - H5_LEAVE(TRUE); + H5_LEAVE(true); CATCH H5TOOLS_ENDDEBUG(" "); @@ -2246,7 +2246,7 @@ done: * True otherwise *------------------------------------------------------------------------- */ -hbool_t +bool render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream, hid_t container) { hssize_t snpoints; @@ -2255,33 +2255,33 @@ render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *strea unsigned ndims; hid_t dtype = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - hbool_t past_catch = FALSE; - hbool_t ret_value = TRUE; + bool past_catch = false; + bool ret_value = true; H5TOOLS_START_DEBUG(" "); if ((snpoints = H5Sget_select_elem_npoints(region_space)) <= 0) - H5TOOLS_THROW(FALSE, "H5Sget_select_elem_npoints failed"); + H5TOOLS_THROW(false, "H5Sget_select_elem_npoints failed"); npoints = (hsize_t)snpoints; /* Allocate space for the dimension array */ if ((sndims = H5Sget_simple_extent_ndims(region_space)) < 0) - H5TOOLS_THROW(FALSE, "H5Sget_simple_extent_ndims failed"); + H5TOOLS_THROW(false, "H5Sget_simple_extent_ndims failed"); ndims = (unsigned)sndims; if ((dtype = H5Dget_type(region_id)) < 0) - H5TOOLS_GOTO_ERROR(FALSE, "H5Dget_type failed"); + H5TOOLS_GOTO_ERROR(false, "H5Dget_type failed"); if ((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0) - H5TOOLS_GOTO_ERROR(FALSE, "H5Tget_native_type failed"); + H5TOOLS_GOTO_ERROR(false, "H5Tget_native_type failed"); render_bin_output_region_data_points(region_space, region_id, stream, container, ndims, type_id, npoints); done: if (type_id > 0 && H5Tclose(type_id) < 0) - H5TOOLS_ERROR(FALSE, "H5Tclose failed"); + H5TOOLS_ERROR(false, "H5Tclose failed"); if (dtype > 0 && H5Tclose(dtype) < 0) - H5TOOLS_ERROR(FALSE, "H5Tclose failed"); + H5TOOLS_ERROR(false, "H5Tclose failed"); H5_LEAVE(ret_value); CATCH @@ -2294,20 +2294,20 @@ done: * * Purpose: Determines if memory is initialized to all zero bytes. * - * Return: TRUE if all bytes are zero - * FALSE otherwise + * Return: true if all bytes are zero + * false otherwise *------------------------------------------------------------------------- */ -H5_ATTR_PURE hbool_t +H5_ATTR_PURE bool h5tools_is_zero(const void *_mem, size_t size) { const unsigned char *mem = (const unsigned char *)_mem; while (size-- > 0) if (mem[size]) - return FALSE; + return false; - return TRUE; + return true; } /*------------------------------------------------------------------------- @@ -2323,15 +2323,15 @@ h5tools_is_zero(const void *_mem, size_t size) * char *name1: link name of the first object. * Use "." or NULL if loc_id2 is the object to be compared. * - * Return: TRUE if it is the same object - * FALSE otherwise. + * Return: true if it is the same object + * false otherwise. *------------------------------------------------------------------------- */ -hbool_t +bool h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2) { H5O_info2_t oinfo1, oinfo2; - hbool_t ret_val = FALSE; + bool ret_val = false; if (name1 && HDstrcmp(name1, ".") != 0) H5Oget_info_by_name3(loc_id1, name1, &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -2349,7 +2349,7 @@ h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char H5Otoken_cmp(loc_id1, &oinfo1.token, &oinfo2.token, &token_cmp_val); if (!token_cmp_val) - ret_val = TRUE; + ret_val = true; } return ret_val; diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index 98ced40..9126500 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -291,7 +291,7 @@ typedef struct h5tool_format_t { * * Numeric data is also subject to the formats for individual elements. */ - hbool_t raw; + bool raw; const char *fmt_raw; const char *fmt_int; const char *fmt_uint; @@ -674,17 +674,17 @@ H5TOOLS_DLL int h5tools_set_error_file(const char *fname, int is_bin); H5TOOLS_DLL hid_t h5tools_get_fapl(hid_t prev_fapl_id, h5tools_vol_info_t *vol_info, h5tools_vfd_info_t *vfd_info); H5TOOLS_DLL herr_t h5tools_get_vfd_name(hid_t fid, hid_t fapl_id, char *drivername, size_t drivername_size); -H5TOOLS_DLL hid_t h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, hbool_t use_specific_driver, +H5TOOLS_DLL hid_t h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, bool use_specific_driver, char *drivername, size_t drivername_size); H5TOOLS_DLL hid_t h5tools_get_little_endian_type(hid_t type); H5TOOLS_DLL hid_t h5tools_get_big_endian_type(hid_t type); H5TOOLS_DLL htri_t h5tools_detect_vlen(hid_t tid); H5TOOLS_DLL htri_t h5tools_detect_vlen_str(hid_t tid); -H5TOOLS_DLL hbool_t h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2); +H5TOOLS_DLL bool h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2); H5TOOLS_DLL void init_acc_pos(unsigned ndims, const hsize_t *dims, hsize_t *acc, hsize_t *pos, hsize_t *p_min_idx); H5TOOLS_DLL hsize_t calc_acc_pos(unsigned ndims, hsize_t elemtno, const hsize_t *acc, hsize_t *pos); -H5TOOLS_DLL hbool_t h5tools_is_zero(const void *_mem, size_t size); +H5TOOLS_DLL bool h5tools_is_zero(const void *_mem, size_t size); H5TOOLS_DLL int h5tools_canreadf(const char *name, hid_t dcpl_id); H5TOOLS_DLL int h5tools_can_encode(H5Z_filter_t filtn); @@ -694,25 +694,25 @@ H5TOOLS_DLL void h5tools_region_simple_prefix(FILE *stream, const h5tool_format_ h5tools_context_t *ctx, hsize_t elmtno, hsize_t *ptdata, int secnum); -H5TOOLS_DLL int render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t nelmts); -H5TOOLS_DLL int render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t container, - unsigned ndims, hid_t type_id, hsize_t nblocks, - const hsize_t *ptdata); -H5TOOLS_DLL hbool_t render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream, - hid_t container); -H5TOOLS_DLL int render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE *stream, - hid_t container, unsigned ndims, hid_t type_id, - hsize_t npoints); -H5TOOLS_DLL hbool_t render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream, - hid_t container); - -H5TOOLS_DLL hbool_t h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, - h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, - hsize_t local_elmt_counter, hsize_t elmt_counter); -H5TOOLS_DLL hbool_t h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx, h5tools_str_t *buffer, - hsize_t *curr_pos, size_t ncols, hsize_t *ptdata, - hsize_t local_elmt_counter, hsize_t elmt_counter); +H5TOOLS_DLL int render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t nelmts); +H5TOOLS_DLL int render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t container, + unsigned ndims, hid_t type_id, hsize_t nblocks, + const hsize_t *ptdata); +H5TOOLS_DLL bool render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream, + hid_t container); +H5TOOLS_DLL int render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE *stream, + hid_t container, unsigned ndims, hid_t type_id, + hsize_t npoints); +H5TOOLS_DLL bool render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream, + hid_t container); + +H5TOOLS_DLL bool h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, + h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, + hsize_t local_elmt_counter, hsize_t elmt_counter); +H5TOOLS_DLL bool h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx, h5tools_str_t *buffer, + hsize_t *curr_pos, size_t ncols, hsize_t *ptdata, + hsize_t local_elmt_counter, hsize_t elmt_counter); #ifdef __cplusplus } diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index 2986de7..7c221f5 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -248,7 +248,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont unsigned char *mem = (unsigned char *)_mem; hsize_t i; /* element counter */ size_t size; /* size of each datum */ - hbool_t dimension_break = TRUE; + bool dimension_break = true; size_t ncols = 80; /* available output width */ h5tools_str_t buffer; /* string into which to render */ hsize_t curr_pos = 0; /* total data element position */ @@ -299,7 +299,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont dimension_break = h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, i, elmt_counter); /* Render the data element end*/ - if (FALSE == dimension_break) + if (false == dimension_break) elmt_counter = 0; } /* end for (i = 0; i < nelmts... */ H5TOOLS_DEBUG("data render finish"); @@ -334,7 +334,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont * hsize_t elmt_count is the data element loop counter *------------------------------------------------------------------------- */ -hbool_t +bool h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, /* in,out */ h5tools_str_t *buffer, /* string into which to render */ @@ -342,13 +342,13 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format size_t ncols, hsize_t region_elmt_counter, /* element counter */ hsize_t elmt_counter) { - hbool_t dimension_break = TRUE; + bool dimension_break = true; hid_t atype = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; hid_t region_space = H5I_INVALID_HID; h5tool_format_t outputformat; /* Use to disable prefix for DATA attribute display */ - hbool_t past_catch = FALSE; - hbool_t ret_value = TRUE; + bool past_catch = false; + bool ret_value = true; assert(info); assert(ctx); @@ -379,16 +379,16 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format H5TOOLS_GOTO_ERROR(dimension_break, "H5Tget_native_type failed"); ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the datatype element begin */ h5tools_str_reset(buffer); h5tools_str_append(buffer, "%s %s ", h5tools_dump_header_format->datatypebegin, h5tools_dump_header_format->datatypeblockbegin); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; ctx->indent_level++; - h5tools_print_datatype(stream, buffer, info, ctx, atype, TRUE); + h5tools_print_datatype(stream, buffer, info, ctx, atype, true); ctx->indent_level--; if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) { @@ -403,7 +403,7 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter); /* Render the datatype element end */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the dataspace element begin */ h5tools_str_reset(buffer); @@ -424,9 +424,9 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format /* Render the dataspace element end */ if (region_output) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; - h5tools_dump_data(stream, &outputformat, ctx, region_id, FALSE); + h5tools_dump_data(stream, &outputformat, ctx, region_id, false); } done: @@ -440,7 +440,7 @@ done: H5TOOLS_ERROR(dimension_break, "H5Sclose failed"); ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the region } element begin */ h5tools_str_reset(buffer); @@ -482,7 +482,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for size_t ncols, unsigned ndims, hid_t type_id, hsize_t nblocks, hsize_t *ptdata) { - hbool_t dimension_break = TRUE; + bool dimension_break = true; hsize_t *dims1 = NULL; hsize_t *start = NULL; hsize_t *count = NULL; @@ -495,7 +495,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for hsize_t numindex; unsigned indx; unsigned jndx; - hbool_t past_catch = FALSE; + bool past_catch = false; size_t type_size; hid_t mem_space = H5I_INVALID_HID; hid_t sid1 = H5I_INVALID_HID; @@ -551,7 +551,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for ctx.prev_multiline = cur_ctx->prev_multiline; ctx.ndims = ndims; for (blkndx = 0; blkndx < nblocks; blkndx++) { - ctx.need_prefix = TRUE; + ctx.need_prefix = true; ctx.cur_elmt = 0; for (indx = 0; indx < ndims; indx++) { start[indx] = ptdata[indx + blkndx * ndims * 2]; @@ -600,7 +600,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for ncols, ptdata, numindex, elmtno); /* Render the region data element end */ - if (FALSE == dimension_break) + if (false == dimension_break) elmtno = 0; } /* end for (numindex = 0; numindex < numelem; numindex++, elmtno++, ctx.cur_elmt++) */ } @@ -658,7 +658,7 @@ done: * hsize_t elmt_count is the data element loop counter *------------------------------------------------------------------------- */ -hbool_t +bool h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, /* in,out */ h5tools_str_t *buffer, /* string into which to render */ @@ -666,7 +666,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea size_t ncols, hsize_t region_elmt_counter, /* element counter */ hsize_t elmt_counter) { - hbool_t dimension_break = TRUE; + bool dimension_break = true; hssize_t snblocks; hsize_t nblocks; hsize_t alloc_size; @@ -677,8 +677,8 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea hid_t dtype = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; h5tool_format_t outputformat; /* Use to disable prefix for DATA attribute display */ - hbool_t past_catch = FALSE; - hbool_t ret_value = TRUE; + bool past_catch = false; + bool ret_value = true; assert(info); assert(ctx); @@ -711,7 +711,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea /* Render the region { element end */ ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the region datatype info and indices element begin */ h5tools_str_reset(buffer); @@ -749,7 +749,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter); /* Render the region datatype info and indices element end */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; if ((dtype = H5Dget_type(region_id)) < 0) H5TOOLS_GOTO_ERROR(dimension_break, "H5Dget_type failed"); @@ -762,7 +762,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea h5tools_dump_header_format->datatypeblockbegin); ctx->indent_level++; - h5tools_print_datatype(stream, buffer, info, ctx, dtype, TRUE); + h5tools_print_datatype(stream, buffer, info, ctx, dtype, true); ctx->indent_level--; if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) { @@ -777,7 +777,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter); /* Render the datatype element end */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the dataspace element begin */ h5tools_str_reset(buffer); @@ -798,7 +798,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea /* Render the dataspace element end */ if (region_output) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the databegin element begin */ h5tools_str_reset(buffer); @@ -808,7 +808,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea region_elmt_counter, elmt_counter); /* Render the databegin element end */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_print_region_data_blocks(region_id, rawdatastream, info, ctx, buffer, ncols, ndims, type_id, nblocks, ptdata); @@ -824,7 +824,7 @@ done: H5TOOLS_ERROR(dimension_break, "H5Tclose failed"); if (region_output) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the dataend element begin */ h5tools_str_reset(buffer); @@ -842,7 +842,7 @@ done: } ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the region } element begin */ h5tools_str_reset(buffer); @@ -884,7 +884,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre h5tools_str_t *buffer, size_t ncols, unsigned ndims, hid_t type_id, hsize_t npoints, hsize_t *ptdata) { - hbool_t dimension_break = TRUE; + bool dimension_break = true; hsize_t *dims1 = NULL; hsize_t elmtno; /* element index */ hsize_t curr_pos = 0; @@ -896,7 +896,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre hid_t mem_space = H5I_INVALID_HID; void *region_buf = NULL; h5tools_context_t ctx; - hbool_t past_catch = FALSE; + bool past_catch = false; int ret_value = 0; assert(info); @@ -936,7 +936,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre H5TOOLS_DEBUG("data render start:%ld", npoints); elmtno = 0; for (jndx = 0; jndx < npoints; jndx++, elmtno++) { - ctx.need_prefix = TRUE; + ctx.need_prefix = true; ctx.cur_elmt = 0; /* points are always 0 */ ctx.indent_level++; @@ -974,7 +974,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre dimension_break = h5tools_render_region_element(stream, info, &ctx, buffer, &curr_pos, ncols, ptdata, (hsize_t)0, elmtno); /* Render the point element end */ - if (FALSE == dimension_break) + if (false == dimension_break) elmtno = 0; } else { @@ -1019,13 +1019,13 @@ done: * hsize_t elmt_count is the data element loop counter *------------------------------------------------------------------------- */ -hbool_t +bool h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter, hsize_t elmt_counter) { - hbool_t dimension_break = TRUE; + bool dimension_break = true; hssize_t snpoints; hsize_t npoints; hsize_t alloc_size; @@ -1036,8 +1036,8 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea hid_t dtype = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; h5tool_format_t outputformat; /* Use to disable prefix for DATA attribute display */ - hbool_t past_catch = FALSE; - hbool_t ret_value = TRUE; + bool past_catch = false; + bool ret_value = true; assert(info); assert(ctx); @@ -1070,7 +1070,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea /* Render the region { element end */ ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the region datatype info and indices element begin */ h5tools_str_reset(buffer); @@ -1103,7 +1103,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter); /* Render the region datatype info and indices element end */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; if ((dtype = H5Dget_type(region_id)) < 0) H5TOOLS_GOTO_ERROR(dimension_break, "H5Dget_type failed"); @@ -1116,7 +1116,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea h5tools_dump_header_format->datatypeblockbegin); ctx->indent_level++; - h5tools_print_datatype(stream, buffer, info, ctx, dtype, TRUE); + h5tools_print_datatype(stream, buffer, info, ctx, dtype, true); ctx->indent_level--; if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) { @@ -1131,7 +1131,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter); /* Render the datatype element end */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the dataspace element begin */ h5tools_str_reset(buffer); @@ -1152,7 +1152,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea /* Render the dataspace element end */ if (region_output) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the databegin element begin */ h5tools_str_reset(buffer); @@ -1163,7 +1163,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea dimension_break = h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_print_region_data_points(region_space, region_id, rawdatastream, info, ctx, buffer, ncols, ndims, type_id, npoints, ptdata); @@ -1179,7 +1179,7 @@ done: H5TOOLS_ERROR(dimension_break, "H5Tclose failed"); if (region_output) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the dataend element begin */ h5tools_str_reset(buffer); @@ -1197,7 +1197,7 @@ done: } ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; /* Render the region } element begin */ h5tools_str_reset(buffer); @@ -1271,7 +1271,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c hid_t sm_space = H5I_INVALID_HID; /* stripmine data space */ hsize_t size_row_block; /* size for blocks along rows */ hsize_t row_counter = 0; - hbool_t past_catch = FALSE; + bool past_catch = false; /* VL data special information */ unsigned int vl_data = 0; /* contains VL datatypes */ herr_t ret_value = SUCCEED; @@ -1283,8 +1283,8 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c size_row_block = ctx->sset->block.data[row_dim]; /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen(p_type) == TRUE) - vl_data = TRUE; + if (h5tools_detect_vlen(p_type) == true) + vl_data = true; /* display loop */ for (; hyperslab_count > 0; temp_start[row_dim] += temp_stride[row_dim], hyperslab_count--) { @@ -1364,7 +1364,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c } ctx->sm_pos += low[ctx->ndims - 1]; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; if (h5tools_dump_simple_data(stream, info, ctx, dset, flags, sm_nelmts, p_type, sm_buf) < 0) H5TOOLS_THROW(FAIL, "h5tools_dump_simple_data failed"); @@ -1566,7 +1566,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_co int sndims; hid_t f_space = H5I_INVALID_HID; /* file data space */ hsize_t total_size[H5S_MAX_RANK]; /* total size of dataset*/ - hbool_t past_catch = FALSE; + bool past_catch = false; herr_t ret_value = SUCCEED; H5TOOLS_START_DEBUG(" "); @@ -1624,7 +1624,7 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont hsize_t zero[8]; /* vector of zeros */ unsigned int flags; /* buffer extent flags */ hsize_t total_size[H5S_MAX_RANK]; /* total size of dataset*/ - hbool_t past_catch = FALSE; + bool past_catch = false; /* Print info */ size_t p_type_nbytes; /* size of memory type */ @@ -1679,8 +1679,8 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont } /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen(p_type) == TRUE) - vl_data = TRUE; + if (h5tools_detect_vlen(p_type) == true) + vl_data = true; /* * Determine the strip mine size and allocate a buffer. The strip mine is @@ -1805,7 +1805,7 @@ h5tools_dump_simple_mem(FILE *stream, const h5tool_format_t *info, h5tools_conte unsigned i; /* counters */ hsize_t total_size[H5S_MAX_RANK]; /* total size of dataset*/ hsize_t p_nelmts; /* total selected elmts */ - hbool_t past_catch = FALSE; + bool past_catch = false; unsigned char *buf = NULL; /* buffer for raw data */ int ret_value = 0; @@ -1844,8 +1844,8 @@ h5tools_dump_simple_mem(FILE *stream, const h5tool_format_t *info, h5tools_conte H5_LEAVE(SUCCEED); /* nothing to print */ /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen(p_type) == TRUE) - vl_data = TRUE; + if (h5tools_detect_vlen(p_type) == true) + vl_data = true; alloc_size = p_nelmts * H5Tget_size(p_type); assert(alloc_size == (hsize_t)((size_t)alloc_size)); /*check for overflow*/ @@ -2062,8 +2062,8 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ H5T_order_t order; H5T_class_t type_class; H5T_sign_t sign; /* sign scheme value */ - htri_t is_vlstr = FALSE; - hbool_t past_catch = FALSE; + htri_t is_vlstr = false; + bool past_catch = false; const char *sign_s = NULL; /* sign scheme string */ const char *order_s = NULL; /* byte order string */ int ret_value = 0; @@ -2102,57 +2102,57 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ switch (type_class) { case H5T_INTEGER: - if (H5Tequal(type, H5T_STD_I8BE) == TRUE) + if (H5Tequal(type, H5T_STD_I8BE) == true) h5tools_str_append(buffer, "H5T_STD_I8BE"); - else if (H5Tequal(type, H5T_STD_I8LE) == TRUE) + else if (H5Tequal(type, H5T_STD_I8LE) == true) h5tools_str_append(buffer, "H5T_STD_I8LE"); - else if (H5Tequal(type, H5T_STD_I16BE) == TRUE) + else if (H5Tequal(type, H5T_STD_I16BE) == true) h5tools_str_append(buffer, "H5T_STD_I16BE"); - else if (H5Tequal(type, H5T_STD_I16LE) == TRUE) + else if (H5Tequal(type, H5T_STD_I16LE) == true) h5tools_str_append(buffer, "H5T_STD_I16LE"); - else if (H5Tequal(type, H5T_STD_I32BE) == TRUE) + else if (H5Tequal(type, H5T_STD_I32BE) == true) h5tools_str_append(buffer, "H5T_STD_I32BE"); - else if (H5Tequal(type, H5T_STD_I32LE) == TRUE) + else if (H5Tequal(type, H5T_STD_I32LE) == true) h5tools_str_append(buffer, "H5T_STD_I32LE"); - else if (H5Tequal(type, H5T_STD_I64BE) == TRUE) + else if (H5Tequal(type, H5T_STD_I64BE) == true) h5tools_str_append(buffer, "H5T_STD_I64BE"); - else if (H5Tequal(type, H5T_STD_I64LE) == TRUE) + else if (H5Tequal(type, H5T_STD_I64LE) == true) h5tools_str_append(buffer, "H5T_STD_I64LE"); - else if (H5Tequal(type, H5T_STD_U8BE) == TRUE) + else if (H5Tequal(type, H5T_STD_U8BE) == true) h5tools_str_append(buffer, "H5T_STD_U8BE"); - else if (H5Tequal(type, H5T_STD_U8LE) == TRUE) + else if (H5Tequal(type, H5T_STD_U8LE) == true) h5tools_str_append(buffer, "H5T_STD_U8LE"); - else if (H5Tequal(type, H5T_STD_U16BE) == TRUE) + else if (H5Tequal(type, H5T_STD_U16BE) == true) h5tools_str_append(buffer, "H5T_STD_U16BE"); - else if (H5Tequal(type, H5T_STD_U16LE) == TRUE) + else if (H5Tequal(type, H5T_STD_U16LE) == true) h5tools_str_append(buffer, "H5T_STD_U16LE"); - else if (H5Tequal(type, H5T_STD_U32BE) == TRUE) + else if (H5Tequal(type, H5T_STD_U32BE) == true) h5tools_str_append(buffer, "H5T_STD_U32BE"); - else if (H5Tequal(type, H5T_STD_U32LE) == TRUE) + else if (H5Tequal(type, H5T_STD_U32LE) == true) h5tools_str_append(buffer, "H5T_STD_U32LE"); - else if (H5Tequal(type, H5T_STD_U64BE) == TRUE) + else if (H5Tequal(type, H5T_STD_U64BE) == true) h5tools_str_append(buffer, "H5T_STD_U64BE"); - else if (H5Tequal(type, H5T_STD_U64LE) == TRUE) + else if (H5Tequal(type, H5T_STD_U64LE) == true) h5tools_str_append(buffer, "H5T_STD_U64LE"); - else if (H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_SCHAR) == true) h5tools_str_append(buffer, "H5T_NATIVE_SCHAR"); - else if (H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_UCHAR) == true) h5tools_str_append(buffer, "H5T_NATIVE_UCHAR"); - else if (H5Tequal(type, H5T_NATIVE_SHORT) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_SHORT) == true) h5tools_str_append(buffer, "H5T_NATIVE_SHORT"); - else if (H5Tequal(type, H5T_NATIVE_USHORT) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_USHORT) == true) h5tools_str_append(buffer, "H5T_NATIVE_USHORT"); - else if (H5Tequal(type, H5T_NATIVE_INT) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_INT) == true) h5tools_str_append(buffer, "H5T_NATIVE_INT"); - else if (H5Tequal(type, H5T_NATIVE_UINT) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_UINT) == true) h5tools_str_append(buffer, "H5T_NATIVE_UINT"); - else if (H5Tequal(type, H5T_NATIVE_LONG) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_LONG) == true) h5tools_str_append(buffer, "H5T_NATIVE_LONG"); - else if (H5Tequal(type, H5T_NATIVE_ULONG) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_ULONG) == true) h5tools_str_append(buffer, "H5T_NATIVE_ULONG"); - else if (H5Tequal(type, H5T_NATIVE_LLONG) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_LLONG) == true) h5tools_str_append(buffer, "H5T_NATIVE_LLONG"); - else if (H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_ULLONG) == true) h5tools_str_append(buffer, "H5T_NATIVE_ULLONG"); else { @@ -2190,21 +2190,21 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ break; case H5T_FLOAT: - if (H5Tequal(type, H5T_IEEE_F32BE) == TRUE) + if (H5Tequal(type, H5T_IEEE_F32BE) == true) h5tools_str_append(buffer, "H5T_IEEE_F32BE"); - else if (H5Tequal(type, H5T_IEEE_F32LE) == TRUE) + else if (H5Tequal(type, H5T_IEEE_F32LE) == true) h5tools_str_append(buffer, "H5T_IEEE_F32LE"); - else if (H5Tequal(type, H5T_IEEE_F64BE) == TRUE) + else if (H5Tequal(type, H5T_IEEE_F64BE) == true) h5tools_str_append(buffer, "H5T_IEEE_F64BE"); - else if (H5Tequal(type, H5T_IEEE_F64LE) == TRUE) + else if (H5Tequal(type, H5T_IEEE_F64LE) == true) h5tools_str_append(buffer, "H5T_IEEE_F64LE"); - else if (H5Tequal(type, H5T_VAX_F32) == TRUE) + else if (H5Tequal(type, H5T_VAX_F32) == true) h5tools_str_append(buffer, "H5T_VAX_F32"); - else if (H5Tequal(type, H5T_VAX_F64) == TRUE) + else if (H5Tequal(type, H5T_VAX_F64) == true) h5tools_str_append(buffer, "H5T_VAX_F64"); - else if (H5Tequal(type, H5T_NATIVE_FLOAT) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_FLOAT) == true) h5tools_str_append(buffer, "H5T_NATIVE_FLOAT"); - else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE) + else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == true) h5tools_str_append(buffer, "H5T_NATIVE_DOUBLE"); else { /* print what the library knows */ @@ -2250,7 +2250,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); @@ -2261,7 +2261,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); @@ -2301,7 +2301,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); @@ -2340,7 +2340,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); @@ -2415,7 +2415,7 @@ found_string_type: (hsize_t)0); ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); if (H5Tclose(str_type) < 0) @@ -2427,21 +2427,21 @@ found_string_type: break; case H5T_BITFIELD: - if (H5Tequal(type, H5T_STD_B8BE) == TRUE) + if (H5Tequal(type, H5T_STD_B8BE) == true) h5tools_str_append(buffer, "H5T_STD_B8BE"); - else if (H5Tequal(type, H5T_STD_B8LE) == TRUE) + else if (H5Tequal(type, H5T_STD_B8LE) == true) h5tools_str_append(buffer, "H5T_STD_B8LE"); - else if (H5Tequal(type, H5T_STD_B16BE) == TRUE) + else if (H5Tequal(type, H5T_STD_B16BE) == true) h5tools_str_append(buffer, "H5T_STD_B16BE"); - else if (H5Tequal(type, H5T_STD_B16LE) == TRUE) + else if (H5Tequal(type, H5T_STD_B16LE) == true) h5tools_str_append(buffer, "H5T_STD_B16LE"); - else if (H5Tequal(type, H5T_STD_B32BE) == TRUE) + else if (H5Tequal(type, H5T_STD_B32BE) == true) h5tools_str_append(buffer, "H5T_STD_B32BE"); - else if (H5Tequal(type, H5T_STD_B32LE) == TRUE) + else if (H5Tequal(type, H5T_STD_B32LE) == true) h5tools_str_append(buffer, "H5T_STD_B32LE"); - else if (H5Tequal(type, H5T_STD_B64BE) == TRUE) + else if (H5Tequal(type, H5T_STD_B64BE) == true) h5tools_str_append(buffer, "H5T_STD_B64BE"); - else if (H5Tequal(type, H5T_STD_B64LE) == TRUE) + else if (H5Tequal(type, H5T_STD_B64LE) == true) h5tools_str_append(buffer, "H5T_STD_B64LE"); else h5tools_str_append(buffer, "undefined bitfield"); @@ -2458,7 +2458,7 @@ found_string_type: if (NULL == (ttag = H5Tget_tag(type))) H5TOOLS_THROW((-1), "H5Tget_tag failed"); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "OPAQUE_TAG \"%s\";", ttag); @@ -2468,7 +2468,7 @@ found_string_type: H5free_memory(ttag); if ((size = H5Tget_size(type)) <= 0) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "OPAQUE_SIZE \"%zu\";", size); @@ -2478,7 +2478,7 @@ found_string_type: } ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "%s", h5tools_dump_header_format->opaqblockend); @@ -2497,10 +2497,10 @@ found_string_type: for (i = 0; i < nmembers; i++) { mname = H5Tget_member_name(type, i); if ((mtype = H5Tget_member_type(type, i)) >= 0) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); - h5tools_print_datatype(stream, buffer, info, ctx, mtype, TRUE); + h5tools_print_datatype(stream, buffer, info, ctx, mtype, true); h5tools_str_append(buffer, " \"%s\";", mname); h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, @@ -2514,7 +2514,7 @@ found_string_type: } ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "%s", h5tools_dump_header_format->cmpdblockend); @@ -2522,13 +2522,13 @@ found_string_type: case H5T_REFERENCE: h5tools_str_append(buffer, "%s", h5tools_dump_header_format->refblockbegin); - if (H5Tequal(type, H5T_STD_REF_DSETREG) == TRUE) { + if (H5Tequal(type, H5T_STD_REF_DSETREG) == true) { h5tools_str_append(buffer, "H5T_STD_REF_DSETREG"); } - else if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) { + else if (H5Tequal(type, H5T_STD_REF_OBJ) == true) { h5tools_str_append(buffer, "H5T_STD_REF_OBJECT"); } - else if (H5Tequal(type, H5T_STD_REF) == TRUE) { + else if (H5Tequal(type, H5T_STD_REF) == true) { h5tools_str_append(buffer, "H5T_STD_REF"); } else { @@ -2546,10 +2546,10 @@ found_string_type: (hsize_t)0); ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); - h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE); + h5tools_print_datatype(stream, buffer, info, ctx, super, true); if (H5Tclose(super) < 0) H5TOOLS_ERROR((-1), "H5Tclose failed"); @@ -2562,7 +2562,7 @@ found_string_type: ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "%s", h5tools_dump_header_format->enumblockend); @@ -2575,7 +2575,7 @@ found_string_type: h5tools_str_append(buffer, "%s", h5tools_dump_header_format->vlenblockbegin); - h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE); + h5tools_print_datatype(stream, buffer, info, ctx, super, true); if (H5Tclose(super) < 0) H5TOOLS_ERROR((-1), "H5Tclose failed"); @@ -2607,7 +2607,7 @@ found_string_type: /* Get array base type */ if ((super = H5Tget_super(type)) >= 0) { /* Print base type */ - h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE); + h5tools_print_datatype(stream, buffer, info, ctx, super, true); /* Close array base type */ if (H5Tclose(super) < 0) H5TOOLS_ERROR((-1), "H5Tclose failed"); @@ -2649,7 +2649,7 @@ h5tools_print_dataspace(h5tools_str_t *buffer, hid_t space) hsize_t maxsize[H5TOOLS_DUMP_MAX_RANK]; int ndims = -1; H5S_class_t space_type = -1; - hbool_t past_catch = FALSE; + bool past_catch = false; int i; int ret_value = 0; @@ -2738,7 +2738,7 @@ h5tools_print_enum(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *i size_t dst_size; /*destination value type size */ size_t ncols = 80; /*available output width */ hsize_t curr_pos = 0; /* total data element position */ - hbool_t past_catch = FALSE; + bool past_catch = false; int ret_value = 0; H5TOOLS_START_DEBUG(" "); @@ -2802,7 +2802,7 @@ h5tools_print_enum(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *i for (i = 0; i < nmembs; i++) { int nchars; /*number of output characters */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0); h5tools_str_reset(buffer); @@ -2885,12 +2885,12 @@ h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info, h5tools_context if (info->line_ncols > 0) ncols = info->line_ncols; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->datatypebegin, h5tools_dump_header_format->datatypeblockbegin); - h5tools_print_datatype(stream, &buffer, info, ctx, type, TRUE); + h5tools_print_datatype(stream, &buffer, info, ctx, type, true); if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) { h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datatypeblockend); if (HDstrlen(h5tools_dump_header_format->datatypeend)) @@ -2931,7 +2931,7 @@ h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info, h5tools_contex if (info->line_ncols > 0) ncols = info->line_ncols; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s ", h5tools_dump_header_format->dataspacebegin); @@ -2978,7 +2978,7 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, h5tools_context_t *c if (info->line_ncols > 0) ncols = info->line_ncols; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s %" PRId64 " %s", OBJID, BEGIN, oid, END); @@ -3004,7 +3004,7 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_ { switch (H5Sget_select_type(vspace)) { case H5S_SEL_NONE: /* Nothing selected */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "%s", VDS_NONE); @@ -3017,7 +3017,7 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_ h5tools_str_append(buffer, " %s", h5tools_dump_header_format->virtualselectionblockend); break; case H5S_SEL_HYPERSLABS: /* "New-style" hyperslab selection defined */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); if (H5Sis_regular_hyperslab(vspace)) { @@ -3035,7 +3035,7 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_ h5tools_render_element(stream, info, ctx, buffer, curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_simple_prefix(stream, info, ctx, *curr_pos, 0); h5tools_str_reset(buffer); @@ -3044,13 +3044,13 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_ } h5tools_render_element(stream, info, ctx, buffer, curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "%s", h5tools_dump_header_format->virtualselectionblockend); break; case H5S_SEL_ALL: /* Entire extent selected */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(buffer); h5tools_str_append(buffer, "%s", VDS_ALL); @@ -3082,7 +3082,7 @@ h5tools_print_fill_value(h5tools_str_t *buffer /*in,out*/, const h5tool_format_t n_type = H5Tget_native_type(type_id, H5T_DIR_DEFAULT); - if (h5tools_detect_vlen(type_id) == TRUE) + if (h5tools_detect_vlen(type_id) == true) vl_data = true; size = H5Tget_size(n_type); @@ -3160,7 +3160,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * * STORAGE_LAYOUT *------------------------------------------------------------------------- */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", STORAGE_LAYOUT, BEGIN); @@ -3172,7 +3172,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * switch (stl) { case H5D_CHUNKED: ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s ", CHUNKED); @@ -3186,7 +3186,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); @@ -3241,14 +3241,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * break; case H5D_COMPACT: ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", COMPACT); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "SIZE %" PRIuHSIZE, storage_size); @@ -3266,14 +3266,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * /* EXTERNAL FILE */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", CONTIGUOUS); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", EXTERNAL, BEGIN); @@ -3284,7 +3284,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * for (j = 0; j < (unsigned)n_external; j++) { H5Pget_external(dcpl_id, j, sizeof(name), name, &offset, &size); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "FILENAME %s SIZE %" PRIuHSIZE, name, size); @@ -3298,7 +3298,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * } ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3311,14 +3311,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * /* NORMAL FILE */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", CONTIGUOUS); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "SIZE %" PRIuHSIZE, storage_size); @@ -3332,7 +3332,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * if (supported & H5VL_OPT_QUERY_SUPPORTED) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); ioffset = H5Dget_offset(dset_id); @@ -3362,7 +3362,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * hid_t virtual_vspace = H5Pget_virtual_vspace(dcpl_id, curr_vmap); hid_t virtual_srcspace = H5Pget_virtual_srcspace(dcpl_id, curr_vmap); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %zu %s ", VDS_MAPPING, curr_vmap, BEGIN); @@ -3371,7 +3371,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", VDS_VIRTUAL, BEGIN); @@ -3385,14 +3385,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", VDS_SOURCE, BEGIN); @@ -3410,7 +3410,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * assert((size_t)ssize_out < sizeof(name)); H5Pget_virtual_dsetname(dcpl_id, curr_vmap, dsetname, sizeof(dsetname)); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", VDS_SRC_FILE, @@ -3420,7 +3420,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", VDS_SRC_DATASET, @@ -3435,7 +3435,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3444,7 +3444,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3464,7 +3464,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * (hsize_t)0); } /*switch*/ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3475,7 +3475,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * *------------------------------------------------------------------------- */ if (H5D_VIRTUAL != stl) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", FILTERS, BEGIN); @@ -3492,7 +3492,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * if (filtn < 0) continue; /* nothing to print for invalid filter */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); switch (filtn) { @@ -3522,14 +3522,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "PIXELS_PER_BLOCK %d", szip_pixels_per_block); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); if (szip_options_mask & H5_SZIP_CHIP_OPTION_MASK) @@ -3539,7 +3539,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); if (szip_options_mask & H5_SZIP_EC_OPTION_MASK) @@ -3549,7 +3549,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); if (szip_options_mask & H5_SZIP_LSB_OPTION_MASK) @@ -3560,7 +3560,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * (hsize_t)0, (hsize_t)0); if (szip_options_mask & H5_SZIP_RAW_OPTION_MASK) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "HEADER %s", "RAW"); @@ -3570,7 +3570,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3595,7 +3595,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "FILTER_ID %d", filtn); @@ -3603,7 +3603,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * (hsize_t)0, (hsize_t)0); if (f_name[0] != '\0') { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "COMMENT %s", f_name); @@ -3611,7 +3611,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * (hsize_t)0, (hsize_t)0); } if (cd_nelmts) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s ", "PARAMS", BEGIN); @@ -3623,7 +3623,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * } ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3634,7 +3634,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * } /*i*/ } /*nfilters*/ else { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "NONE"); @@ -3643,7 +3643,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * } ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3654,7 +3654,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * * FILLVALUE *------------------------------------------------------------------------- */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", FILLVALUE, BEGIN); @@ -3662,7 +3662,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "FILL_TIME "); @@ -3687,7 +3687,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * } h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s ", "VALUE "); @@ -3715,7 +3715,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3726,7 +3726,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * *------------------------------------------------------------------------- */ if (H5D_VIRTUAL != stl) { - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "ALLOCATION_TIME %s", BEGIN); @@ -3734,7 +3734,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); @@ -3761,7 +3761,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s", END); @@ -3816,7 +3816,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, h5tools_context_ if (cmt_bufsize > 0) { comment[cmt_bufsize] = '\0'; /* necessary because null char is not returned */ - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "COMMENT \"%s\"", comment); @@ -3858,7 +3858,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_contex if (info->line_ncols > 0) ncols = info->line_ncols; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s \"%s\" %s", h5tools_dump_header_format->attributebegin, attr_name, @@ -3884,7 +3884,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_contex h5tools_dump_oid(stream, info, ctx, attr_id); if (data_output || attr_data_output) - h5tools_dump_data(stream, info, ctx, attr_id, FALSE); + h5tools_dump_data(stream, info, ctx, attr_id, false); ctx->indent_level--; @@ -3893,7 +3893,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_contex H5Aclose(attr_id); } - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); @@ -3946,25 +3946,25 @@ h5tools_print_packed_bits(h5tools_str_t *buffer, hid_t type) hid_t n_type = H5Tget_native_type(type, H5T_DIR_DEFAULT); if (H5Tget_class(n_type) == H5T_INTEGER) { - if (H5Tequal(n_type, H5T_NATIVE_SCHAR) == TRUE) + if (H5Tequal(n_type, H5T_NATIVE_SCHAR) == true) packed_bits_size = 8 * sizeof(char); - else if (H5Tequal(n_type, H5T_NATIVE_UCHAR) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_UCHAR) == true) packed_bits_size = 8 * sizeof(unsigned char); - else if (H5Tequal(n_type, H5T_NATIVE_SHORT) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_SHORT) == true) packed_bits_size = 8 * sizeof(short); - else if (H5Tequal(n_type, H5T_NATIVE_USHORT) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_USHORT) == true) packed_bits_size = 8 * sizeof(unsigned short); - else if (H5Tequal(n_type, H5T_NATIVE_INT) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_INT) == true) packed_bits_size = 8 * sizeof(int); - else if (H5Tequal(n_type, H5T_NATIVE_UINT) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_UINT) == true) packed_bits_size = 8 * sizeof(unsigned int); - else if (H5Tequal(n_type, H5T_NATIVE_LONG) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_LONG) == true) packed_bits_size = 8 * sizeof(long); - else if (H5Tequal(n_type, H5T_NATIVE_ULONG) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_ULONG) == true) packed_bits_size = 8 * sizeof(unsigned long); - else if (H5Tequal(n_type, H5T_NATIVE_LLONG) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_LLONG) == true) packed_bits_size = 8 * sizeof(long long); - else if (H5Tequal(n_type, H5T_NATIVE_ULLONG) == TRUE) + else if (H5Tequal(n_type, H5T_NATIVE_ULLONG) == true) packed_bits_size = 8 * sizeof(unsigned long long); else error_msg("Packed Bit not valid for this datatype"); @@ -3999,7 +3999,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool if (info->line_ncols > 0) ncols = info->line_ncols; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->subsettingbegin, @@ -4008,7 +4008,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool ctx->indent_level++; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->startbegin, @@ -4018,7 +4018,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool h5tools_dump_header_format->startblockend); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->stridebegin, @@ -4028,7 +4028,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool h5tools_dump_header_format->strideblockend); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->countbegin, @@ -4043,7 +4043,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool h5tools_dump_header_format->countblockend); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->blockbegin, @@ -4088,7 +4088,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex datactx = *ctx; /* print context */ /* Assume entire data space to be printed */ - datactx.need_prefix = TRUE; + datactx.need_prefix = true; memset(&buffer, 0, sizeof(h5tools_str_t)); for (i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) { @@ -4097,7 +4097,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex H5TOOLS_DEBUG("reference loop:%d with curr_pos=%ld", i, curr_pos); - datactx.need_prefix = TRUE; + datactx.need_prefix = true; h5tools_str_reset(&buffer); H5TOOLS_DEBUG("reference loop - h5tools_str_sprint with H5T_STD_REF:%d", i); h5tools_str_sprint(&buffer, info, container, H5T_STD_REF, &ref_buf[i], &datactx); @@ -4113,7 +4113,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex case H5O_TYPE_DATASET: if ((new_obj_id = H5Ropen_object(&ref_buf[i], H5P_DEFAULT, H5P_DEFAULT)) >= 0) { datactx.indent_level++; - h5tools_dump_data(stream, info, &datactx, new_obj_id, TRUE); + h5tools_dump_data(stream, info, &datactx, new_obj_id, true); // h5tools_dump_dset(stream, info, &datactx, new_obj_id); datactx.indent_level--; if (H5Dclose(new_obj_id) < 0) @@ -4139,7 +4139,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex H5TOOLS_DEBUG("ref_type is H5R_DATASET_REGION1"); if ((new_obj_id = H5Ropen_object(&ref_buf[i], H5P_DEFAULT, H5P_DEFAULT)) >= 0) { datactx.indent_level++; - h5tools_dump_data(stream, info, &datactx, new_obj_id, TRUE); + h5tools_dump_data(stream, info, &datactx, new_obj_id, true); // h5tools_dump_dset(stream, info, &datactx, new_obj_id); datactx.indent_level--; if (H5Dclose(new_obj_id) < 0) @@ -4158,7 +4158,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex case H5O_TYPE_DATASET: if ((new_obj_id = H5Ropen_object(&ref_buf[i], H5P_DEFAULT, H5P_DEFAULT)) >= 0) { datactx.indent_level++; - h5tools_dump_data(stream, info, &datactx, new_obj_id, TRUE); + h5tools_dump_data(stream, info, &datactx, new_obj_id, true); // h5tools_dump_dset(stream, info, &datactx, new_obj_id); datactx.indent_level--; if (H5Oclose(new_obj_id) < 0) @@ -4200,14 +4200,14 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - datactx.need_prefix = TRUE; + datactx.need_prefix = true; datactx.indent_level++; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "NULL"); h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); datactx.indent_level--; - datactx.need_prefix = TRUE; + datactx.need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "}"); @@ -4260,14 +4260,14 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - datactx.need_prefix = TRUE; + datactx.need_prefix = true; datactx.indent_level++; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "NULL"); h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); datactx.indent_level--; - datactx.need_prefix = TRUE; + datactx.need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "}"); @@ -4297,7 +4297,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex /*------------------------------------------------------------------------- * Function: dump_data * - * Purpose: Dump attribute, obj_data is FALSE, or dataset data, obj_data is TRUE + * Purpose: Dump attribute, obj_data is false, or dataset data, obj_data is true * * Return: void *------------------------------------------------------------------------- @@ -4358,7 +4358,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t * ctx->indent_level++; } - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_str_reset(&buffer); h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->databegin, h5tools_dump_header_format->datablockbegin); @@ -4381,7 +4381,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t * H5Sget_simple_extent_dims(space, total_size, NULL); init_acc_pos(datactx.ndims, total_size, datactx.acc, datactx.pos, datactx.p_min_idx); - datactx.need_prefix = TRUE; + datactx.need_prefix = true; if (NULL != (ref_buf = (H5R_ref_t *)calloc(MAX(sizeof(unsigned), sizeof(H5R_ref_t)), (size_t)ndims))) { @@ -4420,18 +4420,18 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t * */ string_dataformat.idx_fmt = "\""; datactx.indent_level++; - datactx.need_prefix = TRUE; + datactx.need_prefix = true; h5tools_simple_prefix(stream, &string_dataformat, &datactx, (hsize_t)0, 0); string_dataformat.line_multi_new = 1; string_dataformat.str_repeat = 8; - string_dataformat.ascii = TRUE; + string_dataformat.ascii = true; string_dataformat.elmt_suf1 = ""; string_dataformat.elmt_suf2 = ""; string_dataformat.line_suf = "\""; } else { - datactx.need_prefix = TRUE; + datactx.need_prefix = true; } /* Print all the values. */ @@ -4453,7 +4453,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t * if (datactx.display_char && H5Tget_size(f_type) == 1 && H5Tget_class(f_type) == H5T_INTEGER) { H5TOOLS_DEBUG("Print 1-byte integer data as an ASCII character string eol=%s", string_dataformat.line_suf); - datactx.need_prefix = FALSE; + datactx.need_prefix = false; string_dataformat.arr_linebreak = 0; string_dataformat.idx_fmt = ""; string_dataformat.line_multi_new = 0; @@ -4474,7 +4474,7 @@ done: H5Sclose(space); H5Tclose(f_type); - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_simple_prefix(stream, &outputformat, ctx, (hsize_t)0, 0); h5tools_str_reset(&buffer); @@ -4492,7 +4492,7 @@ done: if (ctx->sset && obj_data) { ctx->indent_level--; - ctx->need_prefix = TRUE; + ctx->need_prefix = true; h5tools_simple_prefix(stream, &outputformat, ctx, (hsize_t)0, 0); h5tools_str_reset(&buffer); diff --git a/tools/lib/h5tools_dump.h b/tools/lib/h5tools_dump.h index c8e1992..e57158a 100644 --- a/tools/lib/h5tools_dump.h +++ b/tools/lib/h5tools_dump.h @@ -42,40 +42,40 @@ H5TOOLS_DLL int h5tools_dump_mem(FILE *stream, const h5tool_format_t *info, h5to H5TOOLS_DLL int h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx /*in,out*/, hid_t container, unsigned flags, hsize_t nelmts, hid_t type, void *_mem); -H5TOOLS_DLL void h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, hid_t type); -H5TOOLS_DLL void h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, hid_t space); -H5TOOLS_DLL void h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, const char *attr_name, - hid_t attr_id); -H5TOOLS_DLL void h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, hid_t oid); -H5TOOLS_DLL void h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, hid_t dcpl, hid_t type_id, - hid_t obj_id); -H5TOOLS_DLL void h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, hid_t obj_id); -H5TOOLS_DLL void h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, - hid_t obj_id, int obj_data); -H5TOOLS_DLL void h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, - hid_t container, H5R_ref_t *ref_buf, int ndims); -H5TOOLS_DLL hbool_t h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer, - hsize_t *curr_pos, size_t ncols, - hsize_t region_elmt_counter, hsize_t elmt_counter); +H5TOOLS_DLL void h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, hid_t type); +H5TOOLS_DLL void h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, hid_t space); +H5TOOLS_DLL void h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, const char *attr_name, + hid_t attr_id); +H5TOOLS_DLL void h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, hid_t oid); +H5TOOLS_DLL void h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, hid_t dcpl, hid_t type_id, + hid_t obj_id); +H5TOOLS_DLL void h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, hid_t obj_id); +H5TOOLS_DLL void h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, + hid_t obj_id, int obj_data); +H5TOOLS_DLL void h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, + hid_t container, H5R_ref_t *ref_buf, int ndims); +H5TOOLS_DLL bool h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer, + hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter, + hsize_t elmt_counter); -H5TOOLS_DLL hbool_t h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *stream, - const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer, - hsize_t *curr_pos, size_t ncols, - hsize_t region_elmt_counter, hsize_t elmt_counter); +H5TOOLS_DLL bool h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *stream, + const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer, + hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter, + hsize_t elmt_counter); -H5TOOLS_DLL hbool_t h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *stream, - const h5tool_format_t *info, - h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer, - hsize_t *curr_pos, size_t ncols, - hsize_t region_elmt_counter, hsize_t elmt_counter); +H5TOOLS_DLL bool h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *stream, + const h5tool_format_t *info, + h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer, + hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter, + hsize_t elmt_counter); H5TOOLS_DLL int h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer /*in,out*/, const h5tool_format_t *info, h5tools_context_t *ctx /*in,out*/, diff --git a/tools/lib/h5tools_error.h b/tools/lib/h5tools_error.h index 8a7414c..e085c72 100644 --- a/tools/lib/h5tools_error.h +++ b/tools/lib/h5tools_error.h @@ -213,7 +213,7 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g; */ #define CATCH \ catch_except:; \ - past_catch = TRUE; + past_catch = true; /* * H5_LEAVE macro, used to facilitate control flow in a function. The argument diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c index d89c546..1f58d95 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -132,7 +132,7 @@ init_ref_path_table(void) return (-1); /* Iterate over objects in this file */ - if (h5trav_visit(thefile, "/", TRUE, TRUE, init_ref_path_cb, NULL, NULL, H5O_INFO_BASIC) < 0) { + if (h5trav_visit(thefile, "/", true, true, init_ref_path_cb, NULL, NULL, H5O_INFO_BASIC) < 0) { error_msg("unable to construct reference path table\n"); h5tools_setstatus(EXIT_FAILURE); } /* end if */ diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index bd75879..507c6ef 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -43,10 +43,10 @@ typedef struct H5LD_memb_t { /* Variable length string datatype */ #define STR_INIT_LEN 4096 /*initial length */ -static char *h5tools_escape(char *s, size_t size); -static hbool_t h5tools_str_is_zero(const void *_mem, size_t size); -static void h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch); -void h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, h5tools_context_t *ctx); +static char *h5tools_escape(char *s, size_t size); +static bool h5tools_str_is_zero(const void *_mem, size_t size); +static void h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch); +void h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, h5tools_context_t *ctx); /*------------------------------------------------------------------------- * Function: h5tools_str_close @@ -1564,20 +1564,20 @@ h5tools_escape(char *s /*in,out*/, size_t size) * * Purpose: Determines if memory is initialized to all zero bytes. * - * Return: TRUE if all bytes are zero; FALSE otherwise + * Return: true if all bytes are zero; false otherwise * *------------------------------------------------------------------------- */ -static hbool_t +static bool h5tools_str_is_zero(const void *_mem, size_t size) { const unsigned char *mem = (const unsigned char *)_mem; while (size-- > 0) if (mem[size]) - return FALSE; + return false; - return TRUE; + return true; } /*------------------------------------------------------------------------- diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index fc9a646..663d355 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -51,7 +51,7 @@ static void init_table(hid_t fid, table_t **tbl); #ifdef H5DUMP_DEBUG static void dump_table(hid_t fid, char *tablename, table_t *table); #endif /* H5DUMP_DEBUG */ -static void add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, hbool_t recorded); +static void add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, bool recorded); /*------------------------------------------------------------------------- * Function: parallel_print @@ -660,7 +660,7 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see switch (oinfo->type) { case H5O_TYPE_GROUP: if (NULL == already_seen) - add_obj(info->group_table, &oinfo->token, name, TRUE); + add_obj(info->group_table, &oinfo->token, name, true); break; case H5O_TYPE_DATASET: @@ -668,7 +668,7 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see hid_t dset = H5I_INVALID_HID; /* Add the dataset to the list of objects */ - add_obj(info->dset_table, &oinfo->token, name, TRUE); + add_obj(info->dset_table, &oinfo->token, name, true); /* Check for a dataset that uses a named datatype */ if ((dset = H5Dopen2(info->fid, name, H5P_DEFAULT)) >= 0) { @@ -679,7 +679,7 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see H5Oget_info3(type, &type_oinfo, H5O_INFO_BASIC); if (search_obj(info->type_table, &type_oinfo.token) == NULL) - add_obj(info->type_table, &type_oinfo.token, name, FALSE); + add_obj(info->type_table, &type_oinfo.token, name, false); } /* end if */ H5Tclose(type); @@ -695,14 +695,14 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see obj_t *found_obj; if ((found_obj = search_obj(info->type_table, &oinfo->token)) == NULL) - add_obj(info->type_table, &oinfo->token, name, TRUE); + add_obj(info->type_table, &oinfo->token, name, true); else { /* Use latest version of name */ free(found_obj->objname); found_obj->objname = HDstrdup(name); /* Mark named datatype as having valid name */ - found_obj->recorded = TRUE; + found_obj->recorded = true; } /* end else */ } /* end if */ break; @@ -744,7 +744,7 @@ init_objs(hid_t fid, find_objs_t *info, table_t **group_table, table_t **dset_ta info->dset_table = *dset_table; /* Find all shared objects */ - if ((ret_value = h5trav_visit(fid, "/", TRUE, TRUE, find_objs_cb, NULL, info, H5O_INFO_BASIC)) < 0) + if ((ret_value = h5trav_visit(fid, "/", true, true, find_objs_cb, NULL, info, H5O_INFO_BASIC)) < 0) H5TOOLS_GOTO_ERROR(FAIL, "finding shared objects failed"); done: @@ -770,7 +770,7 @@ done: *------------------------------------------------------------------------- */ static void -add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, hbool_t record) +add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, bool record) { size_t u; @@ -831,7 +831,7 @@ tmpfile(void) *-------------------------------------------------------------------------*/ int H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t *link_info, - hbool_t get_obj_type) + bool get_obj_type) { htri_t l_ret; H5O_info2_t trg_oinfo; @@ -905,7 +905,7 @@ H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t l_ret = H5Oexists_by_name(file_id, linkpath, lapl); /* detect dangling link */ - if (l_ret == FALSE) { + if (l_ret == false) { H5TOOLS_GOTO_DONE(0); } else if (l_ret < 0) { /* function failed */ @@ -1146,7 +1146,7 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_ext_t *fa, const char **values) printf(" preset fapl with default values\n"); } fa->fa.version = H5FD_CURR_ROS3_FAPL_T_VERSION; - fa->fa.authenticate = FALSE; + fa->fa.authenticate = false; *(fa->fa.aws_region) = '\0'; *(fa->fa.secret_id) = '\0'; *(fa->fa.secret_key) = '\0'; @@ -1236,7 +1236,7 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_ext_t *fa, const char **values) printf(" token set\n"); } - fa->fa.authenticate = TRUE; + fa->fa.authenticate = true; if (show_progress) { printf(" set to authenticate\n"); } diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h index 2efa53f..ce5a24a 100644 --- a/tools/lib/h5tools_utils.h +++ b/tools/lib/h5tools_utils.h @@ -41,8 +41,8 @@ H5TOOLS_DLLVAR hsize_t H5TOOLS_BUFSIZE; typedef struct obj_t { H5O_token_t obj_token; char *objname; - hbool_t displayed; /* Flag to indicate that the object has been displayed */ - hbool_t recorded; /* Flag for named datatypes to indicate they were found in the group hierarchy */ + bool displayed; /* Flag to indicate that the object has been displayed */ + bool recorded; /* Flag for named datatypes to indicate they were found in the group hierarchy */ } obj_t; /*struct for the tables that the find_objs function uses*/ @@ -126,7 +126,7 @@ typedef struct { /* Definitions of routines */ H5TOOLS_DLL int H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t *link_info, - hbool_t get_obj_type); + bool get_obj_type); H5TOOLS_DLL const char *h5tools_getprogname(void); H5TOOLS_DLL void h5tools_setprogname(const char *progname); H5TOOLS_DLL int h5tools_getstatus(void); diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index 5ae379e..438c705 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -38,7 +38,7 @@ typedef struct { typedef struct { trav_addr_t *seen; /* List of addresses seen already */ const trav_visitor_t *visitor; /* Information for visiting each link/object */ - hbool_t is_absolute; /* Whether the traversal has absolute paths */ + bool is_absolute; /* Whether the traversal has absolute paths */ const char *base_grp_name; /* Name of the group that serves as the base * for iteration */ unsigned fields; /* Fields needed in H5O_info2_t struct */ @@ -134,7 +134,7 @@ trav_token_add(trav_addr_t *visited, H5O_token_t *token, const char *path) * * Purpose: Check if an object token has already been seen * - * Return: TRUE/FALSE + * Return: true/false *------------------------------------------------------------------------- */ H5_ATTR_PURE static const char * @@ -241,8 +241,8 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info2_t *linfo, void *_uda *------------------------------------------------------------------------- */ static int -traverse(hid_t file_id, const char *grp_name, hbool_t visit_start, hbool_t recurse, - const trav_visitor_t *visitor, unsigned fields) +traverse(hid_t file_id, const char *grp_name, bool visit_start, bool recurse, const trav_visitor_t *visitor, + unsigned fields) { H5O_info2_t oinfo; /* Object info for starting group */ int ret_value = 0; @@ -428,7 +428,7 @@ h5trav_getinfo(hid_t file_id, trav_info_t *info) info_visitor.udata = info; /* Traverse all objects in the file, visiting each object & link */ - if (traverse(file_id, "/", TRUE, TRUE, &info_visitor, H5O_INFO_BASIC) < 0) + if (traverse(file_id, "/", true, true, &info_visitor, H5O_INFO_BASIC) < 0) H5TOOLS_GOTO_ERROR((-1), "traverse failed"); done: @@ -486,7 +486,7 @@ trav_info_init(const char *filename, hid_t fileid, trav_info_t **_info) info->symlink_visited.nused = 0; info->symlink_visited.nalloc = 0; info->symlink_visited.objs = NULL; - info->symlink_visited.dangle_link = FALSE; + info->symlink_visited.dangle_link = false; *_info = info; } /* end trav_info_init() */ @@ -587,7 +587,7 @@ h5trav_gettable(hid_t fid, trav_table_t *table) table_visitor.udata = table; /* Traverse all objects in the file, visiting each object & link */ - if (traverse(fid, "/", TRUE, TRUE, &table_visitor, H5O_INFO_BASIC) < 0) + if (traverse(fid, "/", true, true, &table_visitor, H5O_INFO_BASIC) < 0) H5TOOLS_GOTO_ERROR((-1), "traverse failed"); done: @@ -1017,7 +1017,7 @@ h5trav_print(hid_t fid) print_visitor.udata = &print_udata; /* Traverse all objects in the file, visiting each object & link */ - if (traverse(fid, "/", TRUE, TRUE, &print_visitor, H5O_INFO_BASIC) < 0) + if (traverse(fid, "/", true, true, &print_visitor, H5O_INFO_BASIC) < 0) H5TOOLS_GOTO_ERROR(FAIL, "traverse failed"); done: @@ -1034,8 +1034,8 @@ done: *------------------------------------------------------------------------- */ int -h5trav_visit(hid_t fid, const char *grp_name, hbool_t visit_start, hbool_t recurse, - h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk, void *udata, unsigned fields) +h5trav_visit(hid_t fid, const char *grp_name, bool visit_start, bool recurse, h5trav_obj_func_t visit_obj, + h5trav_lnk_func_t visit_lnk, void *udata, unsigned fields) { trav_visitor_t visitor; /* Visitor structure for objects */ int ret_value = 0; @@ -1108,10 +1108,10 @@ done: * * Purpose: Check if an symbolic link has already been visited * - * Return: TRUE/FALSE + * Return: true/false *------------------------------------------------------------------------- */ -H5_ATTR_PURE hbool_t +H5_ATTR_PURE bool symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file, const char *path) { size_t u; /* Local index variable */ @@ -1124,12 +1124,12 @@ symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file, c /* if external link, file need to be matched as well */ if (visited->objs[u].type == H5L_TYPE_EXTERNAL) if (!HDstrcmp(visited->objs[u].file, file)) - return (TRUE); + return (true); - return (TRUE); + return (true); } /* end if */ } /* end for */ /* Didn't find symlink */ - return (FALSE); + return (false); } /* end symlink_is_visited() */ diff --git a/tools/lib/h5trav.h b/tools/lib/h5trav.h index 8f3e175..40ceaae 100644 --- a/tools/lib/h5trav.h +++ b/tools/lib/h5trav.h @@ -57,7 +57,7 @@ typedef struct symlink_trav_t { size_t nalloc; size_t nused; symlink_trav_path_t *objs; - hbool_t dangle_link; + bool dangle_link; } symlink_trav_t; typedef struct trav_path_t { @@ -93,7 +93,7 @@ typedef struct trav_link_t { typedef struct trav_obj_t { H5O_token_t obj_token; /* object token */ unsigned flags[2]; /* h5diff.object is present or not in both files*/ - hbool_t is_same_trgobj; /* same target object? no need to compare */ + bool is_same_trgobj; /* same target object? no need to compare */ char *name; /* name */ h5trav_type_t type; /* type of object */ trav_link_t *links; /* array of possible link names */ @@ -126,14 +126,14 @@ extern "C" { * "h5trav general" public functions *------------------------------------------------------------------------- */ -H5TOOLS_DLL void h5trav_set_index(H5_index_t print_index_by, H5_iter_order_t print_index_order); -H5TOOLS_DLL int h5trav_visit(hid_t file_id, const char *grp_name, hbool_t visit_start, hbool_t recurse, - h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk, void *udata, - unsigned fields); -H5TOOLS_DLL herr_t symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, +H5TOOLS_DLL void h5trav_set_index(H5_index_t print_index_by, H5_iter_order_t print_index_order); +H5TOOLS_DLL int h5trav_visit(hid_t file_id, const char *grp_name, bool visit_start, bool recurse, + h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk, void *udata, + unsigned fields); +H5TOOLS_DLL herr_t symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, + const char *path); +H5TOOLS_DLL bool symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file, const char *path); -H5TOOLS_DLL hbool_t symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file, - const char *path); /*------------------------------------------------------------------------- * "h5trav info" public functions |