Source formatted

1 files changed, 393 insertions, 425 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 8a926f6..b6be70d 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -24,50 +24,49 @@
 
 #ifdef H5_TOOLS_DEBUG
 /* global debug variables */
-int       H5tools_INDENT_g = 0;
+int H5tools_INDENT_g = 0;
 #endif
 
-
 /* global variables */
 H5E_auto2_t lib_func;
 H5E_auto2_t tools_func;
-void       *lib_edata;
-void       *tools_edata;
-
-hid_t       H5tools_ERR_STACK_g = H5I_INVALID_HID;
-hid_t       H5tools_ERR_CLS_g = H5I_INVALID_HID;
-hid_t       H5E_tools_g = H5I_INVALID_HID;
-hid_t       H5E_tools_min_id_g = H5I_INVALID_HID;
-hid_t       H5E_tools_min_info_id_g = H5I_INVALID_HID;
-hid_t       H5E_tools_min_dbg_id_g = H5I_INVALID_HID;
-
-FILE       *rawattrstream = NULL;      /* should initialize to stdout but gcc moans about it */
-FILE       *rawdatastream = NULL;      /* should initialize to stdout but gcc moans about it */
-FILE       *rawinstream = NULL;        /* should initialize to stdin but gcc moans about it */
-FILE       *rawoutstream = NULL;       /* should initialize to stdout but gcc moans about it */
-FILE       *rawerrorstream = NULL;     /* should initialize to stderr but gcc moans about it */
-
-int         bin_output;         /* binary output */
-int         bin_form = 0;       /* binary form, default NATIVE */
-int         region_output;      /* region output */
-int         oid_output;         /* oid output */
-int         data_output;        /* data output */
-int         attr_data_output;   /* attribute data output */
-int         compound_data;
-
-unsigned    packed_bits_num;    /* number of packed bits to display */
-unsigned    packed_data_offset; /* offset of packed bits to display */
-unsigned    packed_data_length; /* length of packed bits to display */
-unsigned long long packed_data_mask;  /* mask in which packed bits to display */
-
-int         enable_error_stack = 0;   /* re-enable error stack; disable=0 enable=1 */
+void *      lib_edata;
+void *      tools_edata;
+
+hid_t H5tools_ERR_STACK_g     = H5I_INVALID_HID;
+hid_t H5tools_ERR_CLS_g       = H5I_INVALID_HID;
+hid_t H5E_tools_g             = H5I_INVALID_HID;
+hid_t H5E_tools_min_id_g      = H5I_INVALID_HID;
+hid_t H5E_tools_min_info_id_g = H5I_INVALID_HID;
+hid_t H5E_tools_min_dbg_id_g  = H5I_INVALID_HID;
+
+FILE *rawattrstream  = NULL; /* should initialize to stdout but gcc moans about it */
+FILE *rawdatastream  = NULL; /* should initialize to stdout but gcc moans about it */
+FILE *rawinstream    = NULL; /* should initialize to stdin but gcc moans about it */
+FILE *rawoutstream   = NULL; /* should initialize to stdout but gcc moans about it */
+FILE *rawerrorstream = NULL; /* should initialize to stderr but gcc moans about it */
+
+int bin_output;       /* binary output */
+int bin_form = 0;     /* binary form, default NATIVE */
+int region_output;    /* region output */
+int oid_output;       /* oid output */
+int data_output;      /* data output */
+int attr_data_output; /* attribute data output */
+int compound_data;
+
+unsigned           packed_bits_num;    /* number of packed bits to display */
+unsigned           packed_data_offset; /* offset of packed bits to display */
+unsigned           packed_data_length; /* length of packed bits to display */
+unsigned long long packed_data_mask;   /* mask in which packed bits to display */
+
+int enable_error_stack = 0; /* re-enable error stack; disable=0 enable=1 */
 
 /* sort parameters */
-H5_index_t      sort_by        = H5_INDEX_NAME; /* sort_by [creation_order | name]  */
-H5_iter_order_t sort_order     = H5_ITER_INC;   /* sort_order [ascending | descending] */
+H5_index_t      sort_by    = H5_INDEX_NAME; /* sort_by [creation_order | name]  */
+H5_iter_order_t sort_order = H5_ITER_INC;   /* sort_order [ascending | descending] */
 
 /* module-scoped variables */
-static int  h5tools_init_g;     /* if h5tools lib has been initialized */
+static int h5tools_init_g; /* if h5tools lib has been initialized */
 
 /* Names of VFDs. These names are always available so that
  * the tools can emit special messages when a VFD is asked
@@ -76,21 +75,10 @@ static int  h5tools_init_g;     /* if h5tools lib has been initialized */
  *
  */
 const char *drivernames[] = {
-    "sec2",
-    "direct",
-    "log",
-    "windows",
-    "stdio",
-    "core",
-    "family",
-    "split",
-    "multi",
-    "mpio",
-    "ros3",
-    "hdfs",
+    "sec2", "direct", "log", "windows", "stdio", "core", "family", "split", "multi", "mpio", "ros3", "hdfs",
 };
 
-#define NUM_DRIVERS     (sizeof(drivernames) / sizeof(drivernames[0]))
+#define NUM_DRIVERS (sizeof(drivernames) / sizeof(drivernames[0]))
 
 /*-------------------------------------------------------------------------
  * Function: h5tools_init
@@ -234,9 +222,9 @@ h5tools_close(void)
 int
 h5tools_set_data_output_file(const char *fname, int is_bin)
 {
-    int     retvalue = FAIL;
-    FILE    *f;    /* temporary holding place for the stream pointer
-                    * so that rawdatastream is changed only when succeeded */
+    int   retvalue = FAIL;
+    FILE *f; /* temporary holding place for the stream pointer
+              * so that rawdatastream is changed only when succeeded */
 
     if (rawdatastream && rawdatastream != stdout) {
         if (HDfclose(rawdatastream))
@@ -251,19 +239,19 @@ h5tools_set_data_output_file(const char *fname, int is_bin)
         if (is_bin) {
             if ((f = HDfopen(fname, "wb")) != NULL) {
                 rawdatastream = f;
-                retvalue = SUCCEED;
+                retvalue      = SUCCEED;
             }
         }
         else {
             if ((f = HDfopen(fname, "w")) != NULL) {
                 rawdatastream = f;
-                retvalue = SUCCEED;
+                retvalue      = SUCCEED;
             }
         }
     }
     else {
         rawdatastream = NULL;
-        retvalue = SUCCEED;
+        retvalue      = SUCCEED;
     }
 
     return retvalue;
@@ -282,9 +270,9 @@ h5tools_set_data_output_file(const char *fname, int is_bin)
 int
 h5tools_set_attr_output_file(const char *fname, int is_bin)
 {
-    int     retvalue = FAIL;
-    FILE    *f;    /* temporary holding place for the stream pointer
-                    * so that rawattrstream is changed only when succeeded */
+    int   retvalue = FAIL;
+    FILE *f; /* temporary holding place for the stream pointer
+              * so that rawattrstream is changed only when succeeded */
 
     if (rawattrstream && rawattrstream != stdout) {
         if (HDfclose(rawattrstream))
@@ -299,19 +287,19 @@ h5tools_set_attr_output_file(const char *fname, int is_bin)
         if (is_bin) {
             if ((f = HDfopen(fname, "wb")) != NULL) {
                 rawattrstream = f;
-                retvalue = SUCCEED;
+                retvalue      = SUCCEED;
             }
         }
         else {
             if ((f = HDfopen(fname, "w")) != NULL) {
                 rawattrstream = f;
-                retvalue = SUCCEED;
+                retvalue      = SUCCEED;
             }
         }
     }
     else {
         rawattrstream = NULL;
-        retvalue = SUCCEED;
+        retvalue      = SUCCEED;
     }
 
     return retvalue;
@@ -331,9 +319,9 @@ h5tools_set_attr_output_file(const char *fname, int is_bin)
 int
 h5tools_set_input_file(const char *fname, int is_bin)
 {
-    int     retvalue = FAIL;
-    FILE    *f;    /* temporary holding place for the stream pointer
-                    * so that rawinstream is changed only when succeeded */
+    int   retvalue = FAIL;
+    FILE *f; /* temporary holding place for the stream pointer
+              * so that rawinstream is changed only when succeeded */
 
     if (rawinstream && rawinstream != stdin) {
         if (HDfclose(rawinstream))
@@ -347,19 +335,19 @@ h5tools_set_input_file(const char *fname, int is_bin)
         if (is_bin) {
             if ((f = HDfopen(fname, "rb")) != NULL) {
                 rawinstream = f;
-                retvalue = SUCCEED;
+                retvalue    = SUCCEED;
             }
         }
         else {
             if ((f = HDfopen(fname, "r")) != NULL) {
                 rawinstream = f;
-                retvalue = SUCCEED;
+                retvalue    = SUCCEED;
             }
         }
     }
     else {
         rawinstream = NULL;
-        retvalue = SUCCEED;
+        retvalue    = SUCCEED;
     }
 
     return retvalue;
@@ -379,9 +367,9 @@ h5tools_set_input_file(const char *fname, int is_bin)
 int
 h5tools_set_output_file(const char *fname, int is_bin)
 {
-    int     retvalue = FAIL;
-    FILE    *f;    /* temporary holding place for the stream pointer
-                    * so that rawoutstream is changed only when succeeded */
+    int   retvalue = FAIL;
+    FILE *f; /* temporary holding place for the stream pointer
+              * so that rawoutstream is changed only when succeeded */
 
     if (rawoutstream && rawoutstream != stdout) {
         if (HDfclose(rawoutstream))
@@ -395,19 +383,19 @@ h5tools_set_output_file(const char *fname, int is_bin)
         if (is_bin) {
             if ((f = HDfopen(fname, "wb")) != NULL) {
                 rawoutstream = f;
-                retvalue = SUCCEED;
+                retvalue     = SUCCEED;
             }
         }
         else {
             if ((f = HDfopen(fname, "w")) != NULL) {
                 rawoutstream = f;
-                retvalue = SUCCEED;
+                retvalue     = SUCCEED;
             }
         }
     }
     else {
         rawoutstream = NULL;
-        retvalue = SUCCEED;
+        retvalue     = SUCCEED;
     }
 
     return retvalue;
@@ -426,9 +414,9 @@ h5tools_set_output_file(const char *fname, int is_bin)
 int
 h5tools_set_error_file(const char *fname, int is_bin)
 {
-    int     retvalue = FAIL;
-    FILE    *f;    /* temporary holding place for the stream pointer
-                    * so that rawerrorstream is changed only when succeeded */
+    int   retvalue = FAIL;
+    FILE *f; /* temporary holding place for the stream pointer
+              * so that rawerrorstream is changed only when succeeded */
 
     if (rawerrorstream && rawerrorstream != stderr) {
         if (HDfclose(rawerrorstream))
@@ -439,23 +427,23 @@ h5tools_set_error_file(const char *fname, int is_bin)
 
     /* First check if filename is string "NULL" */
     if (fname != NULL) {
-    /* binary output */
+        /* binary output */
         if (is_bin) {
             if ((f = HDfopen(fname, "wb")) != NULL) {
                 rawerrorstream = f;
-                retvalue = SUCCEED;
+                retvalue       = SUCCEED;
             }
         }
         else {
             if ((f = HDfopen(fname, "w")) != NULL) {
                 rawerrorstream = f;
-                retvalue = SUCCEED;
+                retvalue       = SUCCEED;
             }
         }
     }
     else {
         rawerrorstream = NULL;
-        retvalue = SUCCEED;
+        retvalue       = SUCCEED;
     }
 
     return retvalue;
@@ -495,7 +483,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
         unsigned long long log_flags = H5FD_LOG_LOC_IO | H5FD_LOG_ALLOC;
 
         /* Log Driver */
-        if (H5Pset_fapl_log(fapl_id, NULL, log_flags, (size_t) 0) < 0)
+        if (H5Pset_fapl_log(fapl_id, NULL, log_flags, (size_t)0) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_log failed");
     }
     else if (!HDstrcmp(vfd_info->name, drivernames[WINDOWS_VFD_IDX])) {
@@ -514,7 +502,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
     }
     else if (!HDstrcmp(vfd_info->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->name, drivernames[FAMILY_VFD_IDX])) {
@@ -522,7 +510,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
         /* Set member size to be 0 to indicate the current first member size
          * is the member size.
          */
-        if (H5Pset_fapl_family(fapl_id, (hsize_t) 0, H5P_DEFAULT) < 0)
+        if (H5Pset_fapl_family(fapl_id, (hsize_t)0, H5P_DEFAULT) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_family failed");
     }
     else if (!HDstrcmp(vfd_info->name, drivernames[SPLIT_VFD_IDX])) {
@@ -595,7 +583,7 @@ hid_t
 h5tools_get_fapl(hid_t prev_fapl_id, h5tools_vfd_info_t *vfd_info)
 {
     hid_t new_fapl_id = H5I_INVALID_HID;
-    hid_t ret_value = H5I_INVALID_HID;
+    hid_t ret_value   = H5I_INVALID_HID;
 
     if (prev_fapl_id < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "invalid FAPL");
@@ -743,11 +731,11 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_specific_driver,
-    char *drivername, size_t drivername_size)
+h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_specific_driver, char *drivername,
+              size_t drivername_size)
 {
-    hid_t    fid = H5I_INVALID_HID;
-    hid_t    tmp_fapl_id = H5I_INVALID_HID;
+    hid_t    fid          = H5I_INVALID_HID;
+    hid_t    tmp_fapl_id  = H5I_INVALID_HID;
     hid_t    used_fapl_id = H5I_INVALID_HID;
     unsigned drivernum;
     hid_t    ret_value = H5I_INVALID_HID;
@@ -761,9 +749,8 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
         fid = H5Fopen(fname, flags, fapl_id);
     }
     else {
-        H5E_BEGIN_TRY {
-            fid = H5Fopen(fname, flags, fapl_id);
-        } H5E_END_TRY;
+        H5E_BEGIN_TRY { fid = H5Fopen(fname, flags, fapl_id); }
+        H5E_END_TRY;
     }
 
     /* If we succeeded in opening the file, we're done. */
@@ -784,13 +771,13 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
         h5tools_vfd_info_t vfd_info;
 
         /* Skip the log VFD as it prints out to standard out
-        * and is fundamentally SEC2 anyway.
-        */
+         * and is fundamentally SEC2 anyway.
+         */
         if (drivernum == LOG_VFD_IDX)
             continue;
 
-        vfd_info.info           = NULL;
-        vfd_info.name           = drivernames[drivernum];
+        vfd_info.info = NULL;
+        vfd_info.name = drivernames[drivernum];
 
         /* Get a fapl reflecting the selected VFD */
         if ((tmp_fapl_id = h5tools_get_fapl(fapl_id, &vfd_info)) < 0)
@@ -862,12 +849,12 @@ h5tools_detect_vlen(hid_t tid)
 
     /* 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:
@@ -888,42 +875,42 @@ 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);
-    if(tclass == H5T_ARRAY || tclass == H5T_VLEN) {
+    if (tclass == H5T_ARRAY || tclass == H5T_VLEN) {
         hid_t btid = H5Tget_super(tid);
 
-        if(btid < 0) {
+        if (btid < 0) {
             ret = (htri_t)btid;
             goto done;
         }
         ret = h5tools_detect_vlen_str(btid);
-        if((ret == TRUE) || (ret < 0)) {
+        if ((ret == TRUE) || (ret < 0)) {
             H5Tclose(btid);
             goto done;
         }
     }
-    else if(tclass == H5T_COMPOUND) {
+    else if (tclass == H5T_COMPOUND) {
         unsigned nmembs;
-        int snmembs = H5Tget_nmembers(tid);
+        int      snmembs = H5Tget_nmembers(tid);
         unsigned u;
 
-        if(snmembs < 0) {
+        if (snmembs < 0) {
             ret = FAIL;
             goto done;
         }
         nmembs = (unsigned)snmembs;
 
-        for(u = 0; u < nmembs; u++) {
+        for (u = 0; u < nmembs; u++) {
             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;
             }
@@ -946,13 +933,13 @@ done:
  *-------------------------------------------------------------------------
  */
 void
-h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
-        hsize_t elmtno, int secnum)
+h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, hsize_t elmtno,
+                      int secnum)
 {
     h5tools_str_t prefix;
-    h5tools_str_t str;          /*temporary for indentation */
-    size_t templength = 0;
-    unsigned u, indentlevel = 0;
+    h5tools_str_t str; /*temporary for indentation */
+    size_t        templength = 0;
+    unsigned      u, indentlevel = 0;
 
     if (stream == NULL)
         return;
@@ -966,7 +953,8 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context
     HDmemset(&str, 0, sizeof(h5tools_str_t));
 
     /* Terminate previous line, if any */
-    H5TOOLS_DEBUG("before CR elmtno=%ld, ctx->cur_column=%d, info->idx_fmt=%s, info->line_suf=%s", elmtno, ctx->cur_column, info->idx_fmt, info->line_suf);
+    H5TOOLS_DEBUG("before CR elmtno=%ld, ctx->cur_column=%d, info->idx_fmt=%s, info->line_suf=%s", elmtno,
+                  ctx->cur_column, info->idx_fmt, info->line_suf);
     if (ctx->cur_column) {
         PUTSTREAM(OPT(info->line_suf, ""), stream);
         HDputc('\n', stream);
@@ -1020,8 +1008,8 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context
     H5TOOLS_DEBUG("prefix=%s - templength=%d", prefix.s, templength);
 
     ctx->cur_column = ctx->prev_prefix_len = templength;
-    ctx->cur_elmt = 0;
-    ctx->need_prefix = 0;
+    ctx->cur_elmt                          = 0;
+    ctx->need_prefix                       = 0;
     H5TOOLS_DEBUG("prefix=%s - str=%s", prefix.s, str.s);
 
     /* Free string */
@@ -1043,12 +1031,12 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context
  */
 void
 h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
-        hsize_t elmtno, hsize_t *ptdata, int secnum)
+                             hsize_t elmtno, hsize_t *ptdata, int secnum)
 {
     h5tools_str_t prefix;
-    h5tools_str_t str;       /*temporary for indentation */
-    size_t templength = 0;
-    unsigned u, indentlevel = 0;
+    h5tools_str_t str; /*temporary for indentation */
+    size_t        templength = 0;
+    unsigned      u, indentlevel = 0;
 
     if (stream == NULL)
         return;
@@ -1108,8 +1096,8 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_
         }
 
     ctx->cur_column = ctx->prev_prefix_len = templength;
-    ctx->cur_elmt = 0;
-    ctx->need_prefix = 0;
+    ctx->cur_elmt                          = 0;
+    ctx->need_prefix                       = 0;
 
     /* Free string */
     h5tools_str_close(&prefix);
@@ -1141,13 +1129,14 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_
  */
 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_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 */
+    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 */
 
     if (stream == NULL)
         return dimension_break;
@@ -1163,9 +1152,8 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
      * current location...
      */
     if (info->line_multi_new == 1 &&
-        (ctx->cur_column + h5tools_count_ncols(s) +
-                HDstrlen(OPT(info->elmt_suf2, " ")) +
-                HDstrlen(OPT(info->line_suf, ""))) > ncols) {
+        (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
+         HDstrlen(OPT(info->line_suf, ""))) > ncols) {
         if (ctx->prev_multiline) {
             /*
              * ... and the previous element also occupied more than one
@@ -1173,9 +1161,8 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
              */
             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) {
+        else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
+                  HDstrlen(OPT(info->line_suf, ""))) <= ncols) {
             /*
              * ...but *could* fit on one line otherwise, then we
              * should end the current line and start this element on its
@@ -1197,23 +1184,21 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
 
         if (elmt_counter == ctx->size_last_dim) {
             ctx->need_prefix = TRUE;
-            dimension_break = FALSE;
+            dimension_break  = FALSE;
         }
         H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix);
     }
-    H5TOOLS_DEBUG("elmt_counter=%ld - ctx->size_last_dim=%ld info->line_suf=%s", elmt_counter, ctx->size_last_dim, info->line_suf);
+    H5TOOLS_DEBUG("elmt_counter=%ld - ctx->size_last_dim=%ld info->line_suf=%s", elmt_counter,
+                  ctx->size_last_dim, info->line_suf);
 
     /*
      * If the previous element occupied multiple lines and this element
      * is too long to fit on a line then start this element at the
      * beginning of the line.
      */
-    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)
+    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;
     H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix);
 
@@ -1231,9 +1216,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
      * one-at a time.
      */
     multiline = 0;
-    for (secnum = 0, multiline = 0;
-             (section = HDstrtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK));
-             secnum++) {
+    for (secnum = 0, multiline = 0; (section = HDstrtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK)); secnum++) {
         /*
          * If the current section plus possible suffix and end-of-line
          * information would cause the output to wrap then we need to
@@ -1243,9 +1226,8 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
         /*
          * check for displaying prefix for each section
          */
-        if ( (ctx->cur_column + HDstrlen(section) +
-                HDstrlen(OPT(info->elmt_suf2, " ")) +
-                HDstrlen(OPT(info->line_suf, ""))) > ncols)
+        if ((ctx->cur_column + HDstrlen(section) + HDstrlen(OPT(info->elmt_suf2, " ")) +
+             HDstrlen(OPT(info->line_suf, ""))) > ncols)
             ctx->need_prefix = 1;
 
         /*
@@ -1262,7 +1244,8 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
              * this is necessary to print the array indices
              */
             *curr_pos = ctx->sm_pos + local_elmt_counter;
-            H5TOOLS_DEBUG("curr_pos=%ld - ctx->sm_pos=%ld - ctx->ndims=%ld", *curr_pos, ctx->sm_pos, ctx->ndims);
+            H5TOOLS_DEBUG("curr_pos=%ld - ctx->sm_pos=%ld - ctx->ndims=%ld", *curr_pos, ctx->sm_pos,
+                          ctx->ndims);
 
             h5tools_simple_prefix(stream, info, ctx, *curr_pos, secnum);
         }
@@ -1311,13 +1294,14 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
  */
 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_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 */
+    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 */
 
     H5TOOLS_START_DEBUG("");
     H5TOOLS_DEBUG("elmt_counter=%ld - local_elmt_counter=%ld", elmt_counter, local_elmt_counter);
@@ -1329,9 +1313,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
      * current location...
      */
     if (info->line_multi_new == 1 &&
-            (ctx->cur_column + h5tools_count_ncols(s) +
-                    HDstrlen(OPT(info->elmt_suf2, " ")) +
-                    HDstrlen(OPT(info->line_suf, ""))) > ncols) {
+        (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
+         HDstrlen(OPT(info->line_suf, ""))) > ncols) {
         if (ctx->prev_multiline) {
             /*
              * ... and the previous element also occupied more than one
@@ -1339,9 +1322,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
              */
             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) {
+        else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
+                  HDstrlen(OPT(info->line_suf, ""))) <= ncols) {
             /*
              * ...but *could* fit on one line otherwise, then we
              * should end the current line and start this element on its
@@ -1362,7 +1344,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
 
         if (elmt_counter == ctx->size_last_dim) {
             ctx->need_prefix = TRUE;
-            dimension_break = FALSE;
+            dimension_break  = FALSE;
         }
     }
 
@@ -1372,9 +1354,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
      * beginning of the line.
      */
     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->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
+         HDstrlen(OPT(info->line_suf, ""))) > ncols)
         ctx->need_prefix = TRUE;
 
     /*
@@ -1402,9 +1383,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
          * this check to happen for the first line
          */
         if ((!info->skip_first || local_elmt_counter) &&
-                (ctx->cur_column + HDstrlen(section) +
-                        HDstrlen(OPT(info->elmt_suf2, " ")) +
-                        HDstrlen(OPT(info->line_suf, ""))) > ncols)
+            (ctx->cur_column + HDstrlen(section) + HDstrlen(OPT(info->elmt_suf2, " ")) +
+             HDstrlen(OPT(info->line_suf, ""))) > ncols)
             ctx->need_prefix = 1;
 
         /*
@@ -1452,7 +1432,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
 void
 init_acc_pos(unsigned ndims, hsize_t *dims, hsize_t *acc, hsize_t *pos, hsize_t *p_min_idx)
 {
-    int i;
+    int      i;
     unsigned j;
 
     H5TOOLS_START_DEBUG("");
@@ -1460,7 +1440,7 @@ init_acc_pos(unsigned ndims, hsize_t *dims, hsize_t *acc, hsize_t *pos, hsize_t
     for (i = 0; (unsigned)i < ndims; i++)
         p_min_idx[i] = 0;
 
-    if(ndims > 0) {
+    if (ndims > 0) {
         acc[ndims - 1] = 1;
         for (i = ((int)ndims - 2); i >= 0; i--) {
             acc[i] = acc[i + 1] * dims[i + 1];
@@ -1485,14 +1465,14 @@ init_acc_pos(unsigned ndims, hsize_t *dims, hsize_t *acc, hsize_t *pos, hsize_t
 hsize_t
 calc_acc_pos(unsigned ndims, hsize_t elmtno, hsize_t *acc, hsize_t *pos)
 {
-    int i;
-    hsize_t   curr_pos = elmtno;
+    int     i;
+    hsize_t curr_pos = elmtno;
 
     H5TOOLS_START_DEBUG("");
 
-    if(ndims > 0) {
-        for(i = 0; i < (int)ndims; i++) {
-            if(curr_pos > 0) {
+    if (ndims > 0) {
+        for (i = 0; i < (int)ndims; i++) {
+            if (curr_pos > 0) {
                 H5TOOLS_DEBUG("curr_pos=%ld - ctx->acc[%d]=%ld", curr_pos, i, acc[i]);
                 pos[i] = curr_pos / acc[i];
                 curr_pos -= acc[i] * pos[i];
@@ -1518,20 +1498,20 @@ calc_acc_pos(unsigned ndims, hsize_t elmtno, hsize_t *acc, hsize_t *pos)
  *-------------------------------------------------------------------------
  */
 int
-render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t block_nelmts)
+render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t block_nelmts)
 {
-    unsigned char *mem = (unsigned char*)_mem;
-    size_t         size;   /* datum size */
+    unsigned char *mem = (unsigned char *)_mem;
+    size_t         size; /* datum size */
     hsize_t        block_index;
     H5T_class_t    type_class;
     hbool_t        past_catch = FALSE;
-    int            ret_value = 0;
+    int            ret_value  = 0;
 
     H5TOOLS_START_DEBUG("");
-    if((size = H5Tget_size(tid)) == 0)
+    if ((size = H5Tget_size(tid)) == 0)
         H5TOOLS_THROW((-1), "H5Tget_size failed");
 
-    if((type_class = H5Tget_class(tid)) < 0)
+    if ((type_class = H5Tget_class(tid)) < 0)
         H5TOOLS_THROW((-1), "H5Tget_class failed");
 
     switch (type_class) {
@@ -1541,191 +1521,185 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
         case H5T_BITFIELD:
             H5TOOLS_DEBUG("numbers");
             block_index = block_nelmts * size;
-            while(block_index > 0) {
-                size_t bytes_in        = 0;    /* # of bytes to write  */
-                size_t bytes_wrote     = 0;    /* # of bytes written   */
+            while (block_index > 0) {
+                size_t bytes_in    = 0; /* # of bytes to write  */
+                size_t bytes_wrote = 0; /* # of bytes written   */
 
-                if(block_index > sizeof(size_t))
+                if (block_index > sizeof(size_t))
                     bytes_in = sizeof(size_t);
                 else
                     bytes_in = (size_t)block_index;
 
                 bytes_wrote = HDfwrite(mem, 1, bytes_in, stream);
 
-                if(bytes_wrote != bytes_in || (0 == bytes_wrote && HDferror(stream)))
+                if (bytes_wrote != bytes_in || (0 == bytes_wrote && HDferror(stream)))
                     H5TOOLS_THROW((-1), "fwrite failed");
 
                 block_index -= (hsize_t)bytes_wrote;
                 mem = mem + bytes_wrote;
             }
             break;
-        case H5T_STRING:
-            {
-                unsigned int    i;
-                H5T_str_t       pad;
-                char           *s = NULL;
-                unsigned char   tempuchar;
-
-                H5TOOLS_DEBUG("H5T_STRING");
-                pad = H5Tget_strpad(tid);
-
-                for (block_index = 0; block_index < block_nelmts; block_index++) {
-                    mem = ((unsigned char*)_mem) + block_index * size;
-
-                    if (H5Tis_variable_str(tid)) {
-                        s = *(char **)((void *)mem);
-                        if (s != NULL)
-                            size = HDstrlen(s);
-                        else
-                            H5TOOLS_THROW((-1), "NULL string");
-                    }
-                    else {
-                        s = (char *) mem;
-                    }
-                    for (i = 0; i < size && (s[i] || pad != H5T_STR_NULLTERM); i++) {
-                        HDmemcpy(&tempuchar, &s[i], sizeof(unsigned char));
-                        if (1 != HDfwrite(&tempuchar, sizeof(unsigned char), 1, stream))
-                            H5TOOLS_THROW((-1), "fwrite failed");
-                    } /* i */
-                } /* for (block_index = 0; block_index < block_nelmts; block_index++) */
-            }
-            break;
-        case H5T_COMPOUND:
-            {
-                int      snmembs;
-                unsigned nmembs;
-
-                H5TOOLS_DEBUG("H5T_COMPOUND");
-                if((snmembs = H5Tget_nmembers(tid)) < 0)
-                    H5TOOLS_THROW((-1), "H5Tget_nmembers of compound failed");
-                nmembs = (unsigned)snmembs;
-
-                for (block_index = 0; block_index < block_nelmts; block_index++) {
-                    unsigned j;
-
-                    mem = ((unsigned char*)_mem) + block_index * size;
-                    for (j = 0; j < nmembs; j++) {
-                        hid_t    memb = H5I_INVALID_HID;
-                        size_t   offset;
-
-                        offset = H5Tget_member_offset(tid, j);
-                        memb   = H5Tget_member_type(tid, j);
-
-                        if (render_bin_output(stream, container, memb, mem + offset, 1) < 0) {
-                            H5Tclose(memb);
-                            H5TOOLS_THROW((-1), "render_bin_output of compound member failed");
-                        }
+        case H5T_STRING: {
+            unsigned int  i;
+            H5T_str_t     pad;
+            char *        s = NULL;
+            unsigned char tempuchar;
 
-                        H5Tclose(memb);
-                    }
-                }
-            }
-            break;
-        case H5T_ARRAY:
-            {
-                int     k, ndims;
-                hsize_t dims[H5S_MAX_RANK], temp_nelmts, nelmts;
-                hid_t   memb = H5I_INVALID_HID;
-
-                H5TOOLS_DEBUG("H5T_ARRAY");
-                /* get the array's base datatype for each element */
-                memb = H5Tget_super(tid);
-                ndims = H5Tget_array_ndims(tid);
-                H5Tget_array_dims2(tid, dims);
-                if(ndims >= 1 && ndims <= H5S_MAX_RANK) {
-                    /* calculate the number of array elements */
-                    for (k = 0, nelmts = 1; k < ndims; k++) {
-                        temp_nelmts = nelmts;
-                        temp_nelmts *= dims[k];
-                        nelmts = (size_t) temp_nelmts;
-                    }
+            H5TOOLS_DEBUG("H5T_STRING");
+            pad = H5Tget_strpad(tid);
+
+            for (block_index = 0; block_index < block_nelmts; block_index++) {
+                mem = ((unsigned char *)_mem) + block_index * size;
+
+                if (H5Tis_variable_str(tid)) {
+                    s = *(char **)((void *)mem);
+                    if (s != NULL)
+                        size = HDstrlen(s);
+                    else
+                        H5TOOLS_THROW((-1), "NULL string");
                 }
                 else {
-                    H5Tclose(memb);
-                    H5TOOLS_THROW((-1), "calculate the number of array elements failed");
+                    s = (char *)mem;
                 }
+                for (i = 0; i < size && (s[i] || pad != H5T_STR_NULLTERM); i++) {
+                    HDmemcpy(&tempuchar, &s[i], sizeof(unsigned char));
+                    if (1 != HDfwrite(&tempuchar, sizeof(unsigned char), 1, stream))
+                        H5TOOLS_THROW((-1), "fwrite failed");
+                } /* i */
+            }     /* for (block_index = 0; block_index < block_nelmts; block_index++) */
+        } break;
+        case H5T_COMPOUND: {
+            int      snmembs;
+            unsigned nmembs;
+
+            H5TOOLS_DEBUG("H5T_COMPOUND");
+            if ((snmembs = H5Tget_nmembers(tid)) < 0)
+                H5TOOLS_THROW((-1), "H5Tget_nmembers of compound failed");
+            nmembs = (unsigned)snmembs;
+
+            for (block_index = 0; block_index < block_nelmts; block_index++) {
+                unsigned j;
+
+                mem = ((unsigned char *)_mem) + block_index * size;
+                for (j = 0; j < nmembs; j++) {
+                    hid_t  memb = H5I_INVALID_HID;
+                    size_t offset;
 
-                for (block_index = 0; block_index < block_nelmts; block_index++) {
-                    mem = ((unsigned char*)_mem) + block_index * size;
-                    /* dump the array element */
-                    if (render_bin_output(stream, container, memb, mem, nelmts) < 0) {
+                    offset = H5Tget_member_offset(tid, j);
+                    memb   = H5Tget_member_type(tid, j);
+
+                    if (render_bin_output(stream, container, memb, mem + offset, 1) < 0) {
                         H5Tclose(memb);
-                        H5TOOLS_THROW((-1), "render_bin_output failed");
+                        H5TOOLS_THROW((-1), "render_bin_output of compound member failed");
                     }
+
+                    H5Tclose(memb);
                 }
-                H5Tclose(memb);
             }
-            break;
-        case H5T_VLEN:
-            {
-                hsize_t      nelmts;
-                hid_t        memb = H5I_INVALID_HID;
-
-                H5TOOLS_DEBUG("H5T_VLEN");
-               /* get the VL sequences's base datatype for each element */
-                memb = H5Tget_super(tid);
-
-                for (block_index = 0; block_index < block_nelmts; block_index++) {
-                    mem = ((unsigned char*)_mem) + block_index * size;
-                    /* Get the number of sequence elements */
-                    nelmts = ((hvl_t *)((void *)mem))->len;
-
-                    /* dump the array element */
-                    if (render_bin_output(stream, container, memb, ((char *) (((hvl_t *)((void *)mem))->p)), nelmts) < 0) {
-                        H5Tclose(memb);
-                        H5TOOLS_THROW((-1), "render_bin_output failed");
-                    }
+        } break;
+        case H5T_ARRAY: {
+            int     k, ndims;
+            hsize_t dims[H5S_MAX_RANK], temp_nelmts, nelmts;
+            hid_t   memb = H5I_INVALID_HID;
+
+            H5TOOLS_DEBUG("H5T_ARRAY");
+            /* get the array's base datatype for each element */
+            memb  = H5Tget_super(tid);
+            ndims = H5Tget_array_ndims(tid);
+            H5Tget_array_dims2(tid, dims);
+            if (ndims >= 1 && ndims <= H5S_MAX_RANK) {
+                /* calculate the number of array elements */
+                for (k = 0, nelmts = 1; k < ndims; k++) {
+                    temp_nelmts = nelmts;
+                    temp_nelmts *= dims[k];
+                    nelmts = (size_t)temp_nelmts;
                 }
+            }
+            else {
                 H5Tclose(memb);
+                H5TOOLS_THROW((-1), "calculate the number of array elements failed");
             }
-            break;
-        case H5T_REFERENCE:
-            {
-                H5TOOLS_DEBUG("reference class type");
-                if (size == H5R_DSET_REG_REF_BUF_SIZE) {
-                    /* if (H5Tequal(tid, H5T_STD_REF_DSETREG)) */
-                    H5TOOLS_DEBUG("H5T_STD_REF_DSETREG");
-                    if (region_output) {
-                        /* region data */
-                        hid_t   region_id = H5I_INVALID_HID;
-                        hid_t   region_space = H5I_INVALID_HID;
-                        H5S_sel_type region_type;
-
-                        for (block_index = 0; block_index < block_nelmts; block_index++) {
-                            mem = ((unsigned char*)_mem) + block_index * size;
-                            if((region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, mem)) < 0)
-                                H5TOOLS_INFO("H5Ropen_object H5T_STD_REF failed");
-                            else {
-                                if((region_space = H5Rget_region(container, H5R_DATASET_REGION, mem)) >= 0) {
-                                    if (!h5tools_is_zero(mem, H5R_DSET_REG_REF_BUF_SIZE)) {
-                                        region_type = H5Sget_select_type(region_space);
-                                        if(region_type == H5S_SEL_POINTS)
-                                            render_bin_output_region_points(region_space, region_id, stream, container);
-                                        else
-                                            render_bin_output_region_blocks(region_space, region_id, stream, container);
-                                    }
-                                    else {
-                                        H5TOOLS_INFO("H5Ropen_object H5T_STD_REF NULL");
-                                    }
-                                    H5Sclose(region_space);
-                                } /* end if (region_space >= 0) */
-                                H5Dclose(region_id);
-                            }
-                        }
-                    } /* end if (region_output... */
+
+            for (block_index = 0; block_index < block_nelmts; block_index++) {
+                mem = ((unsigned char *)_mem) + block_index * size;
+                /* dump the array element */
+                if (render_bin_output(stream, container, memb, mem, nelmts) < 0) {
+                    H5Tclose(memb);
+                    H5TOOLS_THROW((-1), "render_bin_output failed");
                 }
-                else if (size == H5R_OBJ_REF_BUF_SIZE) {
-                    /* if (H5Tequal(tid, H5T_STD_REF_OBJ)) */
-                    H5TOOLS_DEBUG("H5T_STD_REF_OBJ");
+            }
+            H5Tclose(memb);
+        } break;
+        case H5T_VLEN: {
+            hsize_t nelmts;
+            hid_t   memb = H5I_INVALID_HID;
+
+            H5TOOLS_DEBUG("H5T_VLEN");
+            /* get the VL sequences's base datatype for each element */
+            memb = H5Tget_super(tid);
+
+            for (block_index = 0; block_index < block_nelmts; block_index++) {
+                mem = ((unsigned char *)_mem) + block_index * size;
+                /* Get the number of sequence elements */
+                nelmts = ((hvl_t *)((void *)mem))->len;
+
+                /* dump the array element */
+                if (render_bin_output(stream, container, memb, ((char *)(((hvl_t *)((void *)mem))->p)),
+                                      nelmts) < 0) {
+                    H5Tclose(memb);
+                    H5TOOLS_THROW((-1), "render_bin_output failed");
                 }
             }
-            break;
+            H5Tclose(memb);
+        } break;
+        case H5T_REFERENCE: {
+            H5TOOLS_DEBUG("reference class type");
+            if (size == H5R_DSET_REG_REF_BUF_SIZE) {
+                /* if (H5Tequal(tid, H5T_STD_REF_DSETREG)) */
+                H5TOOLS_DEBUG("H5T_STD_REF_DSETREG");
+                if (region_output) {
+                    /* region data */
+                    hid_t        region_id    = H5I_INVALID_HID;
+                    hid_t        region_space = H5I_INVALID_HID;
+                    H5S_sel_type region_type;
+
+                    for (block_index = 0; block_index < block_nelmts; block_index++) {
+                        mem = ((unsigned char *)_mem) + block_index * size;
+                        if ((region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, mem)) <
+                            0)
+                            H5TOOLS_INFO("H5Ropen_object H5T_STD_REF failed");
+                        else {
+                            if ((region_space = H5Rget_region(container, H5R_DATASET_REGION, mem)) >= 0) {
+                                if (!h5tools_is_zero(mem, H5R_DSET_REG_REF_BUF_SIZE)) {
+                                    region_type = H5Sget_select_type(region_space);
+                                    if (region_type == H5S_SEL_POINTS)
+                                        render_bin_output_region_points(region_space, region_id, stream,
+                                                                        container);
+                                    else
+                                        render_bin_output_region_blocks(region_space, region_id, stream,
+                                                                        container);
+                                }
+                                else {
+                                    H5TOOLS_INFO("H5Ropen_object H5T_STD_REF NULL");
+                                }
+                                H5Sclose(region_space);
+                            } /* end if (region_space >= 0) */
+                            H5Dclose(region_id);
+                        }
+                    }
+                } /* end if (region_output... */
+            }
+            else if (size == H5R_OBJ_REF_BUF_SIZE) {
+                /* if (H5Tequal(tid, H5T_STD_REF_OBJ)) */
+                H5TOOLS_DEBUG("H5T_STD_REF_OBJ");
+            }
+        } break;
 
         case H5T_TIME:
         case H5T_OPAQUE:
             H5TOOLS_DEBUG("H5T_OPAQUE");
             for (block_index = 0; block_index < block_nelmts; block_index++) {
-                mem = ((unsigned char*)_mem) + block_index * size;
+                mem = ((unsigned char *)_mem) + block_index * size;
                 if (size != HDfwrite(mem, sizeof(char), size, stream))
                     H5TOOLS_THROW((-1), "fwrite failed");
             } /* end for */
@@ -1739,7 +1713,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
             break;
     } /* end switch */
 
-CATCH
+    CATCH
     H5TOOLS_ENDDEBUG("");
     return ret_value;
 }
@@ -1756,55 +1730,55 @@ CATCH
  *-------------------------------------------------------------------------
  */
 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, hsize_t *ptdata)
+render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t container, unsigned ndims,
+                                     hid_t type_id, hsize_t nblocks, hsize_t *ptdata)
 {
-    hsize_t     *dims1 = NULL;
-    hsize_t     *start = NULL;
-    hsize_t     *count = NULL;
-    hsize_t      numelem;
-    hsize_t      total_size[H5S_MAX_RANK];
-    unsigned     jndx;
-    size_t       type_size;
-    hid_t        mem_space = H5I_INVALID_HID;
-    void        *region_buf = NULL;
-    hbool_t      past_catch = FALSE;
-    hsize_t      blkndx;
-    hid_t        sid1 = H5I_INVALID_HID;
-    int          ret_value = -1;
+    hsize_t *dims1 = NULL;
+    hsize_t *start = NULL;
+    hsize_t *count = NULL;
+    hsize_t  numelem;
+    hsize_t  total_size[H5S_MAX_RANK];
+    unsigned jndx;
+    size_t   type_size;
+    hid_t    mem_space  = H5I_INVALID_HID;
+    void *   region_buf = NULL;
+    hbool_t  past_catch = FALSE;
+    hsize_t  blkndx;
+    hid_t    sid1      = H5I_INVALID_HID;
+    int      ret_value = -1;
 
     H5TOOLS_START_DEBUG("");
     /* Get the dataspace of the dataset */
-    if((sid1 = H5Dget_space(region_id)) < 0)
+    if ((sid1 = H5Dget_space(region_id)) < 0)
         H5TOOLS_THROW((-1), "H5Dget_space failed");
 
     /* Allocate space for the dimension array */
-    if((dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
+    if ((dims1 = (hsize_t *)HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
         H5TOOLS_THROW((-1), "Could not allocate buffer for dims");
 
     /* find the dimensions of each data space from the block coordinates */
     numelem = 1;
     for (jndx = 0; jndx < ndims; jndx++) {
         dims1[jndx] = ptdata[jndx + ndims] - ptdata[jndx] + 1;
-        numelem = dims1[jndx] * numelem;
+        numelem     = dims1[jndx] * numelem;
     }
 
     /* Create dataspace for reading buffer */
-    if((mem_space = H5Screate_simple((int)ndims, dims1, NULL)) < 0)
+    if ((mem_space = H5Screate_simple((int)ndims, dims1, NULL)) < 0)
         H5TOOLS_THROW((-1), "H5Screate_simple failed");
 
-    if((type_size = H5Tget_size(type_id)) == 0)
+    if ((type_size = H5Tget_size(type_id)) == 0)
         H5TOOLS_THROW((-1), "H5Tget_size failed");
 
-    if((region_buf = HDmalloc(type_size * (size_t)numelem)) == NULL)
+    if ((region_buf = HDmalloc(type_size * (size_t)numelem)) == NULL)
         H5TOOLS_THROW((-1), "Could not allocate region buffer");
 
     /* Select (x , x , ..., x ) x (y , y , ..., y ) hyperslab for reading memory dataset */
     /*          1   2        n      1   2        n                                       */
-    if((start = (hsize_t *) HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
+    if ((start = (hsize_t *)HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
         H5TOOLS_THROW((-1), "Could not allocate buffer for start");
 
-    if((count = (hsize_t *) HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
+    if ((count = (hsize_t *)HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
         H5TOOLS_THROW((-1), "Could not allocate buffer for count");
 
     for (blkndx = 0; blkndx < nblocks; blkndx++) {
@@ -1813,31 +1787,30 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream,
             count[jndx] = dims1[jndx];
         }
 
-        if(H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
+        if (H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
             H5TOOLS_GOTO_ERROR((-1), "H5Sselect_hyperslab failed");
 
-        if(H5Dread(region_id, type_id, mem_space, sid1, H5P_DEFAULT, region_buf) < 0)
+        if (H5Dread(region_id, type_id, mem_space, sid1, H5P_DEFAULT, region_buf) < 0)
             H5TOOLS_GOTO_ERROR((-1), "H5Dread failed");
 
-        if(H5Sget_simple_extent_dims(mem_space, total_size, NULL) < 0)
+        if (H5Sget_simple_extent_dims(mem_space, total_size, NULL) < 0)
             H5TOOLS_GOTO_ERROR((-1), "H5Sget_simple_extent_dims failed");
 
-        if(render_bin_output(stream, container, type_id, (char*)region_buf, numelem) < 0)
+        if (render_bin_output(stream, container, type_id, (char *)region_buf, numelem) < 0)
             H5TOOLS_GOTO_ERROR((-1), "render_bin_output of data region failed");
         /* Render the region data element end */
-done:
-        ;
+done:;
     } /* end for (blkndx = 0; blkndx < nblocks; blkndx++) */
 
-CATCH
+    CATCH
     HDfree(start);
     HDfree(count);
     HDfree(region_buf);
     HDfree(dims1);
 
-    if(H5Sclose(mem_space) < 0)
+    if (H5Sclose(mem_space) < 0)
         H5TOOLS_ERROR((-1), "H5Sclose failed");
-    if(H5Sclose(sid1) < 0)
+    if (H5Sclose(sid1) < 0)
         H5TOOLS_ERROR((-1), "H5Sclose failed");
 
     H5TOOLS_ENDDEBUG("");
@@ -1855,40 +1828,39 @@ CATCH
  *-------------------------------------------------------------------------
  */
 hbool_t
-render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
-        FILE *stream, hid_t container)
+render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream, hid_t container)
 {
-    hssize_t     snblocks;
-    hsize_t      nblocks;
-    hsize_t      alloc_size;
-    hsize_t     *ptdata = NULL;
-    int          sndims;
-    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;
+    hssize_t snblocks;
+    hsize_t  nblocks;
+    hsize_t  alloc_size;
+    hsize_t *ptdata = NULL;
+    int      sndims;
+    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;
 
     H5TOOLS_START_DEBUG("");
-    if((snblocks = H5Sget_select_hyper_nblocks(region_space)) <= 0)
+    if ((snblocks = H5Sget_select_hyper_nblocks(region_space)) <= 0)
         H5TOOLS_THROW(FALSE, "H5Sget_select_hyper_nblocks failed");
     nblocks = (hsize_t)snblocks;
 
     /* Print block information */
-    if((sndims = H5Sget_simple_extent_ndims(region_space)) < 0)
+    if ((sndims = H5Sget_simple_extent_ndims(region_space)) < 0)
         H5TOOLS_THROW(FALSE, "H5Sget_simple_extent_ndims failed");
     ndims = (unsigned)sndims;
 
     alloc_size = nblocks * ndims * 2 * sizeof(ptdata[0]);
-    if((ptdata = (hsize_t*) HDmalloc((size_t) alloc_size)) == NULL)
+    if ((ptdata = (hsize_t *)HDmalloc((size_t)alloc_size)) == NULL)
         H5TOOLS_GOTO_ERROR(FALSE, "Could not allocate buffer for ptdata");
 
-    if(H5Sget_select_hyper_blocklist(region_space, (hsize_t) 0, nblocks, ptdata) < 0)
+    if (H5Sget_select_hyper_blocklist(region_space, (hsize_t)0, nblocks, ptdata) < 0)
         H5TOOLS_GOTO_ERROR(FALSE, "H5Rget_select_hyper_blocklist failed");
 
-    if((dtype = H5Dget_type(region_id)) < 0)
+    if ((dtype = H5Dget_type(region_id)) < 0)
         H5TOOLS_GOTO_ERROR(FALSE, "H5Dget_type failed");
-    if((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
+    if ((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
         H5TOOLS_GOTO_ERROR(FALSE, "H5Tget_native_type failed");
 
     render_bin_output_region_data_blocks(region_id, stream, container, ndims, type_id, nblocks, ptdata);
@@ -1896,15 +1868,15 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
 done:
     HDfree(ptdata);
 
-    if(type_id > 0 && H5Tclose(type_id) < 0)
+    if (type_id > 0 && H5Tclose(type_id) < 0)
         H5TOOLS_ERROR(FALSE, "H5Tclose failed");
 
-    if(dtype > 0 && H5Tclose(dtype) < 0)
+    if (dtype > 0 && H5Tclose(dtype) < 0)
         H5TOOLS_ERROR(FALSE, "H5Tclose failed");
 
     H5_LEAVE(TRUE)
 
-CATCH
+    CATCH
     H5TOOLS_ENDDEBUG("");
     return ret_value;
 }
@@ -1927,44 +1899,43 @@ CATCH
  *-------------------------------------------------------------------------
  */
 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)
+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)
 {
     hsize_t *dims1 = NULL;
     size_t   type_size;
-    hid_t    mem_space = H5I_INVALID_HID;
-    void    *region_buf = NULL;
-    int      ret_value = 0;
+    hid_t    mem_space  = H5I_INVALID_HID;
+    void *   region_buf = NULL;
+    int      ret_value  = 0;
 
     H5TOOLS_START_DEBUG("");
-    if((type_size = H5Tget_size(type_id)) == 0)
+    if ((type_size = H5Tget_size(type_id)) == 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Tget_size failed");
 
-    if((region_buf = HDmalloc(type_size * (size_t)npoints)) == NULL)
+    if ((region_buf = HDmalloc(type_size * (size_t)npoints)) == NULL)
         H5TOOLS_GOTO_ERROR((-1), "Could not allocate buffer for region");
 
     /* Allocate space for the dimension array */
-    if((dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
+    if ((dims1 = (hsize_t *)HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
         H5TOOLS_GOTO_ERROR((-1), "Could not allocate buffer for dims");
 
     dims1[0] = npoints;
-    if((mem_space = H5Screate_simple(1, dims1, NULL)) < 0)
+    if ((mem_space = H5Screate_simple(1, dims1, NULL)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Screate_simple failed");
 
-    if(H5Dread(region_id, type_id, mem_space, region_space, H5P_DEFAULT, region_buf) < 0)
+    if (H5Dread(region_id, type_id, mem_space, region_space, H5P_DEFAULT, region_buf) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Dread failed");
-    if(H5Sget_simple_extent_dims(region_space, dims1, NULL) < 0)
+    if (H5Sget_simple_extent_dims(region_space, dims1, NULL) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Sget_simple_extent_dims failed");
 
-    if(render_bin_output(stream, container, type_id, (char*)region_buf, npoints) < 0)
+    if (render_bin_output(stream, container, type_id, (char *)region_buf, npoints) < 0)
         H5TOOLS_GOTO_ERROR((-1), "render_bin_output of data points failed");
 
 done:
     HDfree(region_buf);
     HDfree(dims1);
 
-    if(H5Sclose(mem_space) < 0)
+    if (H5Sclose(mem_space) < 0)
         H5TOOLS_ERROR((-1), "H5Sclose failed");
 
     H5TOOLS_ENDDEBUG("");
@@ -1982,45 +1953,44 @@ done:
  *-------------------------------------------------------------------------
  */
 hbool_t
-render_bin_output_region_points(hid_t region_space, hid_t region_id,
-        FILE *stream, hid_t container)
+render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream, hid_t container)
 {
     hssize_t snpoints;
     hsize_t  npoints;
     int      sndims;
     unsigned ndims;
-    hid_t    dtype = H5I_INVALID_HID;
-    hid_t    type_id = H5I_INVALID_HID;
+    hid_t    dtype      = H5I_INVALID_HID;
+    hid_t    type_id    = H5I_INVALID_HID;
     hbool_t  past_catch = FALSE;
-    hbool_t  ret_value = TRUE;
+    hbool_t  ret_value  = TRUE;
 
     H5TOOLS_START_DEBUG("");
-    if((snpoints = H5Sget_select_elem_npoints(region_space)) <= 0)
+    if ((snpoints = H5Sget_select_elem_npoints(region_space)) <= 0)
         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)
+    if ((sndims = H5Sget_simple_extent_ndims(region_space)) < 0)
         H5TOOLS_THROW(FALSE, "H5Sget_simple_extent_ndims failed");
     ndims = (unsigned)sndims;
 
-    if((dtype = H5Dget_type(region_id)) < 0)
+    if ((dtype = H5Dget_type(region_id)) < 0)
         H5TOOLS_GOTO_ERROR(FALSE, "H5Dget_type failed");
 
-    if((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
+    if ((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
         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)
+    if (type_id > 0 && H5Tclose(type_id) < 0)
         H5TOOLS_ERROR(FALSE, "H5Tclose failed");
 
-    if(dtype > 0 && H5Tclose(dtype) < 0)
+    if (dtype > 0 && H5Tclose(dtype) < 0)
         H5TOOLS_ERROR(FALSE, "H5Tclose failed");
 
     H5_LEAVE(ret_value)
-CATCH
+    CATCH
     H5TOOLS_ENDDEBUG("");
     return ret_value;
 }
@@ -2037,7 +2007,7 @@ CATCH
 H5_ATTR_PURE hbool_t
 h5tools_is_zero(const void *_mem, size_t size)
 {
-    const unsigned char *mem = (const unsigned char *) _mem;
+    const unsigned char *mem = (const unsigned char *)_mem;
 
     while (size-- > 0)
         if (mem[size])
@@ -2064,25 +2034,23 @@ h5tools_is_zero(const void *_mem, size_t size)
  *-------------------------------------------------------------------------
  */
 hbool_t
-h5tools_is_obj_same(hid_t loc_id1, const char *name1,
-                    hid_t loc_id2, const char *name2)
+h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2)
 {
-    H5O_info_t oinfo1,  oinfo2;
-    hbool_t ret_val = FALSE;
+    H5O_info_t oinfo1, oinfo2;
+    hbool_t    ret_val = FALSE;
 
-    if ( name1 && HDstrcmp(name1, "."))
-      H5Oget_info_by_name2(loc_id1, name1, &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT);
+    if (name1 && HDstrcmp(name1, "."))
+        H5Oget_info_by_name2(loc_id1, name1, &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT);
     else
-      H5Oget_info2(loc_id1, &oinfo1, H5O_INFO_BASIC);
+        H5Oget_info2(loc_id1, &oinfo1, H5O_INFO_BASIC);
 
-    if ( name2 && HDstrcmp(name2, "."))
-      H5Oget_info_by_name2(loc_id2, name2, &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
+    if (name2 && HDstrcmp(name2, "."))
+        H5Oget_info_by_name2(loc_id2, name2, &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
     else
-      H5Oget_info2(loc_id2, &oinfo2, H5O_INFO_BASIC);
+        H5Oget_info2(loc_id2, &oinfo2, H5O_INFO_BASIC);
 
-    if (oinfo1.fileno == oinfo2.fileno && oinfo1.addr==oinfo2.addr)
-      ret_val = 1;
+    if (oinfo1.fileno == oinfo2.fileno && oinfo1.addr == oinfo2.addr)
+        ret_val = 1;
 
     return ret_val;
 }
-