Update reference files and fix int as string

4 files changed, 38 insertions, 32 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 2c5deea..9c217dd 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -755,6 +755,7 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
     HDmemset(&str, 0, sizeof(h5tools_str_t));
 
     /* Terminate previous line, if any */
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "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);
@@ -975,6 +976,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
              */
             ctx->need_prefix = TRUE;
         }
+        H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "ctx->need_prefix=%d", ctx->need_prefix);
     }
 
     /*
@@ -990,8 +992,9 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
             ctx->need_prefix = TRUE;
             dimension_break = FALSE;
         }
+        H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "ctx->need_prefix=%d", ctx->need_prefix);
     }
-    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "elmt_counter=%ld - ctx->size_last_dim=%ld", elmt_counter, ctx->size_last_dim);
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "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
@@ -1005,6 +1008,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
             HDstrlen(OPT(info->elmt_suf2, " ")) +
             HDstrlen(OPT(info->line_suf, ""))) > ncols)
         ctx->need_prefix = TRUE;
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "ctx->need_prefix=%d", ctx->need_prefix);
 
     /*
      * If too many elements have already been printed then we need to
@@ -1012,6 +1016,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
      */
     if (info->line_per_line > 0 && ctx->cur_elmt >= info->line_per_line)
         ctx->need_prefix = TRUE;
+    H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "ctx->need_prefix=%d", ctx->need_prefix);
 
     /*
      * Each OPTIONAL_LINE_BREAK embedded in the rendered string can cause
@@ -1040,6 +1045,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
          * Print the prefix or separate the beginning of this element
          * from the previous element.
          */
+        H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "ctx->need_prefix=%d", ctx->need_prefix);
         if (ctx->need_prefix) {
             if (secnum)
                 multiline++;
diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
index 536b5a4..a20b0b7 100644
--- a/tools/test/h5dump/errfiles/tarray1_big.err
+++ b/tools/test/h5dump/errfiles/tarray1_big.err
@@ -1,31 +1,31 @@
-HDF5-DIAG: Error detected in HDF5 (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/src/H5R.c line 730 in H5Rget_obj_type3(): unable to get object token
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
-  #001: /home/byrn/HDF_Projects/hdf5/dev/src/H5Rint.c line 731 in H5R__get_obj_token(): NULL token size
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/src/H5R.c line 730 in H5Rget_obj_type3(): unable to get object token
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
-  #001: /home/byrn/HDF_Projects/hdf5/dev/src/H5Rint.c line 731 in H5R__get_obj_token(): NULL token size
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/src/H5R.c line 730 in H5Rget_obj_type3(): unable to get object token
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
-  #001: /home/byrn/HDF_Projects/hdf5/dev/src/H5Rint.c line 731 in H5R__get_obj_token(): NULL token size
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-H5tools-DIAG: Error detected in HDF5:tools (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5tools_dump.c line 4044 in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5tools_dump.c line 4044 in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #002: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5tools_dump.c line 4044 in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
+  #002: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
diff --git a/tools/test/h5dump/errfiles/tattrregR.err b/tools/test/h5dump/errfiles/tattrregR.err
index f81f99f..fa2014a 100644
--- a/tools/test/h5dump/errfiles/tattrregR.err
+++ b/tools/test/h5dump/errfiles/tattrregR.err
@@ -1,21 +1,21 @@
-HDF5-DIAG: Error detected in HDF5 (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/src/H5R.c line 730 in H5Rget_obj_type3(): unable to get object token
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
-  #001: /home/byrn/HDF_Projects/hdf5/dev/src/H5Rint.c line 731 in H5R__get_obj_token(): NULL token size
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/src/H5R.c line 730 in H5Rget_obj_type3(): unable to get object token
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
-  #001: /home/byrn/HDF_Projects/hdf5/dev/src/H5Rint.c line 731 in H5R__get_obj_token(): NULL token size
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-H5tools-DIAG: Error detected in HDF5:tools (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5tools_dump.c line 4044 in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5tools_dump.c line 4044 in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
diff --git a/tools/test/h5dump/errfiles/tdataregR.err b/tools/test/h5dump/errfiles/tdataregR.err
index f81f99f..fa2014a 100644
--- a/tools/test/h5dump/errfiles/tdataregR.err
+++ b/tools/test/h5dump/errfiles/tdataregR.err
@@ -1,21 +1,21 @@
-HDF5-DIAG: Error detected in HDF5 (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/src/H5R.c line 730 in H5Rget_obj_type3(): unable to get object token
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
-  #001: /home/byrn/HDF_Projects/hdf5/dev/src/H5Rint.c line 731 in H5R__get_obj_token(): NULL token size
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/src/H5R.c line 730 in H5Rget_obj_type3(): unable to get object token
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
-  #001: /home/byrn/HDF_Projects/hdf5/dev/src/H5Rint.c line 731 in H5R__get_obj_token(): NULL token size
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-H5tools-DIAG: Error detected in HDF5:tools (1.13.0) thread 0:
-  #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5tools_dump.c line 4044 in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5tools_dump.c line 4044 in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function