HDFFV-10876 Update h5dump and h5ls for new ref api.

1 files changed, 161 insertions, 103 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 627d4f2..2c5deea 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -27,6 +27,8 @@ hid_t       H5tools_ERR_STACK_g = 0;
 hid_t       H5tools_ERR_CLS_g = -1;
 hid_t       H5E_tools_g = -1;
 hid_t       H5E_tools_min_id_g = -1;
+hid_t       H5E_tools_min_info_id_g = -1;
+hid_t       H5E_tools_min_dbg_id_g = -1;
 int         compound_data;
 FILE       *rawattrstream = NULL;      /* should initialize to stdout but gcc moans about it */
 FILE       *rawdatastream = NULL;      /* should initialize to stdout but gcc moans about it */
@@ -440,11 +442,11 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     /* Make a copy of the FAPL, for the file open call to use, eventually */
     if (fapl == H5P_DEFAULT) {
         if ((new_fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed");
     } /* end if */
     else {
         if ((new_fapl = H5Pcopy(fapl)) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcopy failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcopy failed");
     } /* end else */
 
     /* Determine which driver the user wants to open the file with. Try
@@ -452,7 +454,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     if (!HDstrcmp(driver, drivernames[SEC2_IDX])) {
         /* SEC2 driver */
         if (H5Pset_fapl_sec2(new_fapl) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_sec2 failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_sec2 failed");
 
         if (drivernum)
             *drivernum = SEC2_IDX;
@@ -464,7 +466,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
          * is the member size.
          */
         if (H5Pset_fapl_family(new_fapl, (hsize_t) 0, H5P_DEFAULT) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_family failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_family failed");
 
         if (drivernum)
             *drivernum = FAMILY_IDX;
@@ -472,7 +474,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     else if (!HDstrcmp(driver, drivernames[SPLIT_IDX])) {
         /* SPLIT Driver */
         if (H5Pset_fapl_split(new_fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_split failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_split failed");
 
         if (drivernum)
             *drivernum = SPLIT_IDX;
@@ -480,7 +482,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     else if (!HDstrcmp(driver, drivernames[MULTI_IDX])) {
         /* MULTI Driver */
         if (H5Pset_fapl_multi(new_fapl, NULL, NULL, NULL, NULL, TRUE) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_multi failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_multi failed");
 
         if(drivernum)
         *drivernum = MULTI_IDX;
@@ -496,7 +498,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
 
         if(mpi_initialized && !mpi_finalized) {
             if(H5Pset_fapl_mpio(new_fapl, MPI_COMM_WORLD, MPI_INFO_NULL) < 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_mpio failed");
+                H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_mpio failed");
             if(drivernum)
                 *drivernum = MPIO_IDX;
         } /* end if */
@@ -734,6 +736,7 @@ void
 h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
                       h5tools_context_t *ctx, hsize_t elmtno, int secnum)
 {
+    H5TOOLS_ERR_INIT(int, SUCCEED)
     h5tools_str_t prefix;
     h5tools_str_t str;          /*temporary for indentation */
     size_t templength = 0;
@@ -745,6 +748,9 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
     if (!ctx->need_prefix)
         return;
 
+    H5TOOLS_PUSH_STACK();
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "enter");
+
     HDmemset(&prefix, 0, sizeof(h5tools_str_t));
     HDmemset(&str, 0, sizeof(h5tools_str_t));
 
@@ -754,9 +760,11 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
         HDputc('\n', stream);
         PUTSTREAM(OPT(info->line_sep, ""), stream);
     }
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "after CR elmtno=%ld, ctx->ndims=%d", elmtno, ctx->ndims);
 
     /* Calculate new prefix */
     h5tools_str_prefix(&prefix, info, elmtno, ctx->ndims, ctx);
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "prefix=%s - str=%s", prefix.s, str.s);
 
     /* Write new prefix to output */
     if (ctx->indent_level > 0)
@@ -784,8 +792,9 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
         PUTSTREAM(h5tools_str_fmt(&prefix, (size_t)0, info->line_pre), stream);
 
     templength = h5tools_str_len(&prefix);
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "prefix=%s - templength=%d", prefix.s, templength);
 
-    for (u = 0; u < indentlevel; u++)
+    for (u = 0; u < indentlevel; u++) {
         /*we already made the indent for the array indices case */
         if (!info->pindex) {
             PUTSTREAM(h5tools_str_fmt(&prefix, (size_t)0, info->line_indent), stream);
@@ -795,14 +804,20 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
             /*we cannot count the prefix for the array indices case */
             templength += h5tools_str_len(&str);
         }
+    }
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "prefix=%s - templength=%d", prefix.s, templength);
 
     ctx->cur_column = ctx->prev_prefix_len = templength;
     ctx->cur_elmt = 0;
     ctx->need_prefix = 0;
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "prefix=%s - str=%s", prefix.s, str.s);
 
     /* Free string */
     h5tools_str_close(&prefix);
     h5tools_str_close(&str);
+
+    H5TOOLS_ENDDEBUG(H5E_tools_min_dbg_id_g, "exit");
+    H5TOOLS_POP_STACK();
 }
 
 /*-------------------------------------------------------------------------
@@ -918,6 +933,7 @@ 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_ERR_INIT(hbool_t, TRUE)
     hbool_t  dimension_break = TRUE;
     char    *s = NULL;
     char    *section = NULL; /* a section of output */
@@ -927,7 +943,12 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
     if (stream == NULL)
         return dimension_break;
 
+    H5TOOLS_PUSH_STACK();
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "enter need_prefix=%d", ctx->need_prefix);
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "elmt_counter=%ld - local_elmt_counter=%ld", elmt_counter, local_elmt_counter);
+
     s = h5tools_str_fmt(buffer, (size_t)0, "%s");
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "s=%s", s);
 
     /*
      * If the element would split on multiple lines if printed at our
@@ -970,6 +991,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
             dimension_break = FALSE;
         }
     }
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "elmt_counter=%ld - ctx->size_last_dim=%ld", elmt_counter, ctx->size_last_dim);
 
     /*
      * If the previous element occupied multiple lines and this element
@@ -1027,6 +1049,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
              * this is necessary to print the array indices
              */
             *curr_pos = ctx->sm_pos + local_elmt_counter;
+            H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "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);
         }
@@ -1034,6 +1057,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
             PUTSTREAM(OPT(info->elmt_suf2, " "), stream);
             ctx->cur_column += HDstrlen(OPT(info->elmt_suf2, " "));
         }
+        H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "section=%s", section);
 
         /* Print the section */
         PUTSTREAM(section, stream);
@@ -1041,6 +1065,10 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
     }
 
     ctx->prev_multiline = multiline;
+
+    H5TOOLS_ENDDEBUG(H5E_tools_min_dbg_id_g, "exit");
+    H5TOOLS_POP_STACK();
+
     return dimension_break;
 }
 
@@ -1074,22 +1102,25 @@ 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_ERR_INIT(hbool_t, TRUE)
     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_PUSH_STACK();
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "enter");
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "elmt_counter=%ld - local_elmt_counter=%ld", elmt_counter, local_elmt_counter);
+
     s = h5tools_str_fmt(buffer, (size_t)0, "%s");
 
     /*
      * If the element would split on multiple lines if printed at our
      * 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) {
+    if (info->line_multi_new == 1 && (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
@@ -1098,8 +1129,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
             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) {
+                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
@@ -1129,12 +1159,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
      * 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;
 
     /*
@@ -1150,8 +1176,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
      * 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
@@ -1163,10 +1188,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
          * 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;
 
         /*
@@ -1177,11 +1199,12 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
             if (secnum)
                 multiline++;
 
-            /* pass to the prefix in h5tools_simple_prefix the total
+            /* pass to the prefix in h5tools_region_simple_prefix the total
              * position instead of the current stripmine position i;
              * this is necessary to print the array indices
              */
             *curr_pos = ctx->sm_pos + local_elmt_counter;
+            H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "curr_pos=%ld - ctx->sm_pos=%ld", *curr_pos, ctx->sm_pos);
 
             h5tools_region_simple_prefix(stream, info, ctx, local_elmt_counter, ptdata, secnum);
         }
@@ -1196,6 +1219,10 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
     }
 
     ctx->prev_multiline = multiline;
+
+    H5TOOLS_ENDDEBUG(H5E_tools_min_dbg_id_g, "exit");
+    H5TOOLS_POP_STACK();
+
     return dimension_break;
 }
 
@@ -1210,16 +1237,25 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
 void
 init_acc_pos(h5tools_context_t *ctx, hsize_t *dims)
 {
+    H5TOOLS_ERR_INIT(int, SUCCEED)
     int i;
     unsigned j;
 
+    H5TOOLS_PUSH_STACK();
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "enter");
+
     if(ctx->ndims > 0) {
         ctx->acc[ctx->ndims - 1] = 1;
-        for (i = ((int)ctx->ndims - 2); i >= 0; i--)
+        for (i = ((int)ctx->ndims - 2); i >= 0; i--) {
             ctx->acc[i] = ctx->acc[i + 1] * dims[i + 1];
+            H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "ctx->acc[%d]=%ld", i, ctx->acc[i]);
+        }
         for (j = 0; j < ctx->ndims; j++)
             ctx->pos[j] = 0;
     }
+
+    H5TOOLS_ENDDEBUG(H5E_tools_min_dbg_id_g, "exit");
+    H5TOOLS_POP_STACK();
 }
 
 /*-------------------------------------------------------------------------
@@ -1234,23 +1270,26 @@ init_acc_pos(h5tools_context_t *ctx, hsize_t *dims)
 int
 render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t block_nelmts)
 {
-    HERR_INIT(int, SUCCEED)
+    H5TOOLS_ERR_INIT(int, SUCCEED)
     unsigned char     *mem  = (unsigned char*)_mem;
     size_t             size;   /* datum size */
     hsize_t            block_index;
     H5T_class_t        type_class;
 
+    H5TOOLS_PUSH_STACK();
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "enter");
     if((size = H5Tget_size(tid)) == 0)
-        H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
 
     if((type_class = H5Tget_class(tid)) < 0)
-        H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_class failed");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_class failed");
 
     switch (type_class) {
         case H5T_INTEGER:
         case H5T_FLOAT:
         case H5T_ENUM:
         case H5T_BITFIELD:
+            H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "numbers");
             block_index = block_nelmts * size;
             while(block_index > 0) {
                 size_t bytes_in        = 0;    /* # of bytes to write  */
@@ -1264,7 +1303,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                 bytes_wrote = HDfwrite(mem, 1, bytes_in, stream);
 
                 if(bytes_wrote != bytes_in || (0 == bytes_wrote && HDferror(stream)))
-                    H5E_THROW(FAIL, H5E_tools_min_id_g, "fwrite failed");
+                    H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "fwrite failed");
 
                 block_index -= (hsize_t)bytes_wrote;
                 mem = mem + bytes_wrote;
@@ -1277,6 +1316,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                 char           *s = NULL;
                 unsigned char   tempuchar;
 
+                H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "H5T_STRING");
                 pad = H5Tget_strpad(tid);
 
                 for (block_index = 0; block_index < block_nelmts; block_index++) {
@@ -1287,7 +1327,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                         if (s != NULL)
                             size = HDstrlen(s);
                         else
-                            H5E_THROW(FAIL, H5E_tools_min_id_g, "NULL string");
+                            H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "NULL string");
                     }
                     else {
                         s = (char *) mem;
@@ -1295,7 +1335,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                     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))
-                            H5E_THROW(FAIL, H5E_tools_min_id_g, "fwrite failed");
+                            H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "fwrite failed");
                     } /* i */
                 } /* for (block_index = 0; block_index < block_nelmts; block_index++) */
             }
@@ -1305,8 +1345,9 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                 int      snmembs;
                 unsigned nmembs;
 
+                H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "H5T_COMPOUND");
                 if((snmembs = H5Tget_nmembers(tid)) < 0)
-                    H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_nmembers of compound failed");
+                    H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_nmembers of compound failed");
                 nmembs = (unsigned)snmembs;
 
                 for (block_index = 0; block_index < block_nelmts; block_index++) {
@@ -1322,7 +1363,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
 
                         if (render_bin_output(stream, container, memb, mem + offset, 1) < 0) {
                             H5Tclose(memb);
-                            H5E_THROW(FAIL, H5E_tools_min_id_g, "render_bin_output of compound member failed");
+                            H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "render_bin_output of compound member failed");
                         }
 
                         H5Tclose(memb);
@@ -1336,6 +1377,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                 hsize_t dims[H5S_MAX_RANK], temp_nelmts, nelmts;
                 hid_t   memb = -1;
 
+                H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "H5T_ARRAY");
                 /* get the array's base datatype for each element */
                 memb = H5Tget_super(tid);
                 ndims = H5Tget_array_ndims(tid);
@@ -1350,7 +1392,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                 }
                 else {
                     H5Tclose(memb);
-                    H5E_THROW(FAIL, H5E_tools_min_id_g, "calculate the number of array elements failed");
+                    H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "calculate the number of array elements failed");
                 }
 
                 for (block_index = 0; block_index < block_nelmts; block_index++) {
@@ -1358,7 +1400,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                     /* dump the array element */
                     if (render_bin_output(stream, container, memb, mem, nelmts) < 0) {
                         H5Tclose(memb);
-                        H5E_THROW(FAIL, H5E_tools_min_id_g, "render_bin_output failed");
+                        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "render_bin_output failed");
                     }
                 }
                 H5Tclose(memb);
@@ -1369,7 +1411,8 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                 hsize_t      nelmts;
                 hid_t        memb = -1;
 
-                /* get the VL sequences's base datatype for each element */
+                H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "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++) {
@@ -1380,7 +1423,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                     /* dump the array element */
                     if (render_bin_output(stream, container, memb, ((char *) (((hvl_t *)((void *)mem))->p)), nelmts) < 0) {
                         H5Tclose(memb);
-                        H5E_THROW(FAIL, H5E_tools_min_id_g, "render_bin_output failed");
+                        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "render_bin_output failed");
                     }
                 }
                 H5Tclose(memb);
@@ -1388,45 +1431,58 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
             break;
         case H5T_REFERENCE:
             {
-                if (size == H5R_DSET_REG_REF_BUF_SIZE) {
-                    /* if (H5Tequal(tid, H5T_STD_REF_DSETREG)) */
+                H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "reference class type");
+                if (H5Tequal(tid, H5T_STD_REF)) {
+                    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "H5T_STD_REF");
                     if (region_output) {
                         /* region data */
-                        hid_t   region_id = -1;
-                        hid_t   region_space = -1;
+                        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;
-                            region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, mem);
-                            if (region_id >= 0) {
-                                region_space = H5Rget_region(container, H5R_DATASET_REGION, mem);
-                                if (region_space >= 0) {
-                                    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);
+                            if((region_id = H5Ropen_object((const H5R_ref_t *)mem, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+                                H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, H5E_tools_min_id_g,
+                                        "H5Ropen_object H5T_STD_REF failed");
+                            else {
+                                if((region_space = H5Ropen_region((const H5R_ref_t *)mem, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
+                                    if (!h5tools_is_zero(mem, H5Tget_size(H5T_STD_REF))) {
+                                        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 {
+                                        H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, H5E_tools_min_id_g,
+                                                "H5Ropen_object H5T_STD_REF NULL");
+                                    }
                                     H5Sclose(region_space);
                                 } /* end if (region_space >= 0) */
                                 H5Dclose(region_id);
-                            } /* end if (region_id >= 0) */
+                            }
                         }
                     } /* end if (region_output... */
                 }
-                else if (size == H5R_OBJ_REF_BUF_SIZE) {
-                    /* if (H5Tequal(tid, H5T_STD_REF_OBJ)) */
-                    ;
+                else if (H5Tequal(tid, H5T_STD_REF_DSETREG)) {
+                    /* if (size == H5R_DSET_REG_REF_BUF_SIZE) */
+                    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "H5T_STD_REF_DSETREG");
+                }
+                else if (H5Tequal(tid, H5T_STD_REF_OBJ)) {
+                    /* if (size == H5R_OBJ_REF_BUF_SIZE) */
+                    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "H5T_STD_REF_OBJ");
                 }
             }
             break;
 
         case H5T_TIME:
         case H5T_OPAQUE:
+            H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "H5T_OPAQUE");
             for (block_index = 0; block_index < block_nelmts; block_index++) {
                 mem = ((unsigned char*)_mem) + block_index * size;
                 if (size != HDfwrite(mem, sizeof(char), size, stream))
-                    H5E_THROW(FAIL, H5E_tools_min_id_g, "fwrite failed");
+                    H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "fwrite failed");
             } /* end for */
             break;
 
@@ -1434,11 +1490,13 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
         case H5T_NCLASSES:
         default:
             /* Badness */
-            H5E_THROW(FAIL, H5E_tools_min_id_g, "bad type class");
+            H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "bad type class");
             break;
     } /* end switch */
 
 CATCH
+    H5TOOLS_ENDDEBUG(H5E_tools_min_dbg_id_g, "exit");
+    H5TOOLS_POP_STACK();
     return ret_value;
 }
 
@@ -1457,6 +1515,7 @@ 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)
 {
+    H5TOOLS_ERR_INIT(int, SUCCEED);
     hsize_t     *dims1 = NULL;
     hsize_t     *start = NULL;
     hsize_t     *count = NULL;
@@ -1468,15 +1527,14 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream,
     void        *region_buf = NULL;
     hsize_t      blkndx;
     hid_t        sid1 = -1;
-    int          ret_value = SUCCEED;
 
     /* Get the dataspace of the dataset */
     if((sid1 = H5Dget_space(region_id)) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_space failed");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "H5Dget_space failed");
 
     /* Allocate space for the dimension array */
     if((dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for dims");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for dims");
 
     /* find the dimensions of each data space from the block coordinates */
     numelem = 1;
@@ -1487,21 +1545,21 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream,
 
     /* Create dataspace for reading buffer */
     if((mem_space = H5Screate_simple((int)ndims, dims1, NULL)) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Screate_simple failed");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "H5Screate_simple failed");
 
     if((type_size = H5Tget_size(type_id)) == 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
 
     if((region_buf = HDmalloc(type_size * (size_t)numelem)) == NULL)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate region buffer");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "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)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for start");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for start");
 
     if((count = (hsize_t *) HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for count");
+        H5TOOLS_THROW(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for count");
 
     for (blkndx = 0; blkndx < nblocks; blkndx++) {
         for (jndx = 0; jndx < ndims; jndx++) {
@@ -1510,29 +1568,31 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream,
         }
 
         if(H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sselect_hyperslab failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sselect_hyperslab failed");
 
         if(H5Dread(region_id, type_id, mem_space, sid1, H5P_DEFAULT, region_buf) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dread failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dread failed");
 
         if(H5Sget_simple_extent_dims(mem_space, total_size, NULL) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_dims failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_dims failed");
 
         if(render_bin_output(stream, container, type_id, (char*)region_buf, numelem) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "render_bin_output of data region failed");
+            H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "render_bin_output of data region failed");
         /* Render the region data element end */
+done:
+        ;
     } /* end for (blkndx = 0; blkndx < nblocks; blkndx++) */
 
- done:
+CATCH
     HDfree(start);
     HDfree(count);
     HDfree(region_buf);
     HDfree(dims1);
 
     if(H5Sclose(mem_space) < 0)
-        HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed");
+        H5TOOLS_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed");
     if(H5Sclose(sid1) < 0)
-        HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed");
+        H5TOOLS_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed");
 
     return ret_value;
 }
@@ -1551,7 +1611,7 @@ hbool_t
 render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
         FILE *stream, hid_t container)
 {
-    HERR_INIT(hbool_t, TRUE)
+    H5TOOLS_ERR_INIT(hbool_t, TRUE)
     hssize_t     snblocks;
     hsize_t      nblocks;
     hsize_t      alloc_size;
@@ -1562,37 +1622,36 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
     hid_t        type_id = -1;
 
     if((snblocks = H5Sget_select_hyper_nblocks(region_space)) <= 0)
-        H5E_THROW(FALSE, H5E_tools_min_id_g, "H5Sget_select_hyper_nblocks failed");
+        H5TOOLS_THROW(FALSE, H5E_tools_min_id_g, "H5Sget_select_hyper_nblocks failed");
     nblocks = (hsize_t)snblocks;
 
     /* Print block information */
     if((sndims = H5Sget_simple_extent_ndims(region_space)) < 0)
-        H5E_THROW(FALSE, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
+        H5TOOLS_THROW(FALSE, H5E_tools_min_id_g, "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)
-        HGOTO_ERROR(FALSE, H5E_tools_min_id_g, "Could not allocate buffer for ptdata");
+        H5TOOLS_GOTO_ERROR(FALSE, H5E_tools_min_id_g, "Could not allocate buffer for ptdata");
 
     if(H5Sget_select_hyper_blocklist(region_space, (hsize_t) 0, nblocks, ptdata) < 0)
-        HGOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Rget_select_hyper_blocklist failed");
+        H5TOOLS_GOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Rget_select_hyper_blocklist failed");
 
     if((dtype = H5Dget_type(region_id)) < 0)
-        HGOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Dget_type failed");
+        H5TOOLS_GOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Dget_type failed");
     if((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
-        HGOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Tget_native_type failed");
+        H5TOOLS_GOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
-    render_bin_output_region_data_blocks(region_id, stream, container, ndims,
-            type_id, nblocks, ptdata);
+    render_bin_output_region_data_blocks(region_id, stream, container, ndims, type_id, nblocks, ptdata);
 
  done:
     HDfree(ptdata);
 
     if(type_id > 0 && H5Tclose(type_id) < 0)
-        HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
+        H5TOOLS_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
 
     if(dtype > 0 && H5Tclose(dtype) < 0)
-        HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
+        H5TOOLS_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
 
     H5_LEAVE(TRUE)
 
@@ -1622,40 +1681,40 @@ 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_ERR_INIT(int, SUCCEED);
     hsize_t *dims1 = NULL;
     size_t   type_size;
     hid_t    mem_space = -1;
     void    *region_buf = NULL;
-    int      ret_value = SUCCEED;
 
     if((type_size = H5Tget_size(type_id)) == 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
+        H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
 
     if((region_buf = HDmalloc(type_size * (size_t)npoints)) == NULL)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for region");
+        H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for region");
 
     /* Allocate space for the dimension array */
     if((dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * ndims)) == NULL)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for dims");
+        H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for dims");
 
     dims1[0] = npoints;
     if((mem_space = H5Screate_simple(1, dims1, NULL)) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Screate_simple failed");
+        H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Screate_simple failed");
 
     if(H5Dread(region_id, type_id, mem_space, region_space, H5P_DEFAULT, region_buf) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dread failed");
+        H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dread failed");
     if(H5Sget_simple_extent_dims(region_space, dims1, NULL) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_dims failed");
+        H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_dims failed");
 
     if(render_bin_output(stream, container, type_id, (char*)region_buf, npoints) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "render_bin_output of data points failed");
+        H5TOOLS_GOTO_ERROR(FAIL, H5E_tools_min_id_g, "render_bin_output of data points failed");
 
  done:
     HDfree(region_buf);
     HDfree(dims1);
 
     if(H5Sclose(mem_space) < 0)
-        HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed");
+        H5TOOLS_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed");
 
     return ret_value;
 }
@@ -1674,7 +1733,7 @@ hbool_t
 render_bin_output_region_points(hid_t region_space, hid_t region_id,
         FILE *stream, hid_t container)
 {
-    HERR_INIT(hbool_t, TRUE)
+    H5TOOLS_ERR_INIT(hbool_t, TRUE)
     hssize_t snpoints;
     hsize_t  npoints;
     int      sndims;
@@ -1683,29 +1742,28 @@ render_bin_output_region_points(hid_t region_space, hid_t region_id,
     hid_t    type_id = -1;
 
     if((snpoints = H5Sget_select_elem_npoints(region_space)) <= 0)
-        H5E_THROW(FALSE, H5E_tools_min_id_g, "H5Sget_select_elem_npoints failed");
+        H5TOOLS_THROW(FALSE, H5E_tools_min_id_g, "H5Sget_select_elem_npoints failed");
     npoints = (hsize_t)snpoints;
 
     /* Allocate space for the dimension array */
     if((sndims = H5Sget_simple_extent_ndims(region_space)) < 0)
-        H5E_THROW(FALSE, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
+        H5TOOLS_THROW(FALSE, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
     ndims = (unsigned)sndims;
 
     if((dtype = H5Dget_type(region_id)) < 0)
-        HGOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Dget_type failed");
+        H5TOOLS_GOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Dget_type failed");
 
     if((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
-        HGOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Tget_native_type failed");
+        H5TOOLS_GOTO_ERROR(FALSE, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
-    render_bin_output_region_data_points(region_space, region_id,
-            stream, container, ndims, type_id, npoints);
+    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)
-        HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
+        H5TOOLS_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
 
     if(dtype > 0 && H5Tclose(dtype) < 0)
-        HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
+        H5TOOLS_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
 
     H5_LEAVE(ret_value)
 CATCH