diff options
Diffstat (limited to 'src/H5trace.c')
-rw-r--r-- | src/H5trace.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/H5trace.c b/src/H5trace.c index 0aa85ed..07326e0 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -59,7 +59,7 @@ /********************/ /* Local Prototypes */ /********************/ -static herr_t H5_trace_args_bool(H5RS_str_t *rs, hbool_t val); +static herr_t H5_trace_args_bool(H5RS_str_t *rs, bool val); static herr_t H5_trace_args_cset(H5RS_str_t *rs, H5T_cset_t cset); static herr_t H5_trace_args_close_degree(H5RS_str_t *rs, H5F_close_degree_t degree); @@ -78,7 +78,7 @@ static herr_t H5_trace_args_close_degree(H5RS_str_t *rs, H5F_close_degree_t degr /*------------------------------------------------------------------------- * Function: H5_trace_args_bool * - * Purpose: This routine formats an hbool_t and adds the output to + * Purpose: This routine formats an bool and adds the output to * the refcounted string (RS) argument. * * Return: SUCCEED / FAIL @@ -86,11 +86,11 @@ static herr_t H5_trace_args_close_degree(H5RS_str_t *rs, H5F_close_degree_t degr *------------------------------------------------------------------------- */ static herr_t -H5_trace_args_bool(H5RS_str_t *rs, hbool_t val) +H5_trace_args_bool(H5RS_str_t *rs, bool val) { /* FUNC_ENTER() should not be called */ - if (TRUE == val) + if (true == val) H5RS_acat(rs, "TRUE"); else if (!val) H5RS_acat(rs, "FALSE"); @@ -250,7 +250,7 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap) type = rest + 1; } else { - rest = (char *)HDstrchr(type, ']'); + rest = (char *)strchr(type, ']'); assert(rest); type = rest + 1; asize_idx = -1; @@ -472,10 +472,10 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap) } /* end switch */ break; - case 'b': /* hbool_t */ + case 'b': /* bool */ { - /* Can't pass hbool_t to va_arg() */ - hbool_t bool_var = (hbool_t)va_arg(ap, int); + /* Can't pass bool to va_arg() */ + bool bool_var = (bool)va_arg(ap, int); H5_trace_args_bool(rs, bool_var); } /* end block */ @@ -897,42 +897,42 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap) { H5D_mpio_no_collective_cause_t nocol_cause_mode = (H5D_mpio_no_collective_cause_t)va_arg(ap, int); - hbool_t flag_already_displayed = FALSE; + bool flag_already_displayed = false; /* Check for all bit-flags which might be set */ if (nocol_cause_mode & H5D_MPIO_COLLECTIVE) { H5RS_acat(rs, "H5D_MPIO_COLLECTIVE"); - flag_already_displayed = TRUE; + flag_already_displayed = true; } /* end if */ if (nocol_cause_mode & H5D_MPIO_SET_INDEPENDENT) { H5RS_asprintf_cat(rs, "%sH5D_MPIO_SET_INDEPENDENT", flag_already_displayed ? " | " : ""); - flag_already_displayed = TRUE; + flag_already_displayed = true; } /* end if */ if (nocol_cause_mode & H5D_MPIO_DATATYPE_CONVERSION) { H5RS_asprintf_cat(rs, "%sH5D_MPIO_DATATYPE_CONVERSION", flag_already_displayed ? " | " : ""); - flag_already_displayed = TRUE; + flag_already_displayed = true; } /* end if */ if (nocol_cause_mode & H5D_MPIO_DATA_TRANSFORMS) { H5RS_asprintf_cat(rs, "%sH5D_MPIO_DATA_TRANSFORMS", flag_already_displayed ? " | " : ""); - flag_already_displayed = TRUE; + flag_already_displayed = true; } /* end if */ if (nocol_cause_mode & H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED) { H5RS_asprintf_cat(rs, "%sH5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED", flag_already_displayed ? " | " : ""); - flag_already_displayed = TRUE; + flag_already_displayed = true; } /* end if */ if (nocol_cause_mode & H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES) { H5RS_asprintf_cat(rs, "%sH5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES", flag_already_displayed ? " | " : ""); - flag_already_displayed = TRUE; + flag_already_displayed = true; } /* end if */ if (nocol_cause_mode & H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET) { H5RS_asprintf_cat(rs, "%sH5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET", flag_already_displayed ? " | " : ""); - flag_already_displayed = TRUE; + flag_already_displayed = true; } /* end if */ /* Display '<none>' if there's no flags set */ @@ -3957,8 +3957,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...) H5RS_str_t *rs = NULL; hssize_t i; FILE *out = H5_debug_g.trace; - static hbool_t is_first_invocation = TRUE; - H5_timer_t function_timer = {{0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}, FALSE}; + static bool is_first_invocation = true; + H5_timer_t function_timer = {{0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}, false}; H5_timevals_t function_times = {0.0, 0.0, 0.0}; static H5_timer_t running_timer; H5_timevals_t running_times; @@ -3993,7 +3993,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...) /* Get time for event if the trace times flag is set */ if (is_first_invocation && H5_debug_g.ttimes) { /* Start the library-wide timer */ - is_first_invocation = FALSE; + is_first_invocation = false; H5_timer_init(&running_timer); H5_timer_start(&running_timer); } @@ -4021,8 +4021,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...) H5_timer_get_times(function_timer, &function_times); H5_timer_get_times(running_timer, &running_times); - HDsnprintf(tmp, sizeof(tmp), "%.6f", (function_times.elapsed - running_times.elapsed)); - H5RS_asprintf_cat(rs, " %*s ", (int)HDstrlen(tmp), ""); + snprintf(tmp, sizeof(tmp), "%.6f", (function_times.elapsed - running_times.elapsed)); + H5RS_asprintf_cat(rs, " %*s ", (int)strlen(tmp), ""); } for (i = 0; i < current_depth; i++) H5RS_aputc(rs, '+'); @@ -4065,7 +4065,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...) last_call_depth = current_depth++; H5RS_acat(rs, ")"); } - HDfputs(H5RS_get_str(rs), out); + fputs(H5RS_get_str(rs), out); fflush(out); H5RS_decr(rs); |