Update h5ls help and rework dump_mem routines for attrs

7 files changed, 41 insertions, 38 deletions

diff --git a/tools/testfiles/help-1.ls b/tools/testfiles/help-1.ls
index 396bed3..7409c16 100644
--- a/tools/testfiles/help-1.ls
+++ b/tools/testfiles/help-1.ls
@@ -20,7 +20,7 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
    --no-dangling-links
                    Must be used with --follow-symlinks option;
                    otherwise, h5ls shows error message and returns an exit
-                   code of 1. 
+                   code of 1.
                    Check for any symbolic links (soft links or external links)
                    that do not resolve to an existing object (dataset, group,
                    or named datatype).
@@ -55,11 +55,8 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
     "%05d" to open a file family.
 
   Deprecated Options
-    The following options have been deprecated in HDF5. While they remain
-    available, they have been superseded as indicated and may be removed
-    from HDF5 in the future. Use the indicated replacement option in all
-    new work; where possible, existing scripts, et cetera, should also be
-    updated to use the replacement option.
+    The following options have been removed in HDF5 1.12. Use the indicated
+    replacement option in all work.
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
diff --git a/tools/testfiles/help-2.ls b/tools/testfiles/help-2.ls
index 396bed3..7409c16 100644
--- a/tools/testfiles/help-2.ls
+++ b/tools/testfiles/help-2.ls
@@ -20,7 +20,7 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
    --no-dangling-links
                    Must be used with --follow-symlinks option;
                    otherwise, h5ls shows error message and returns an exit
-                   code of 1. 
+                   code of 1.
                    Check for any symbolic links (soft links or external links)
                    that do not resolve to an existing object (dataset, group,
                    or named datatype).
@@ -55,11 +55,8 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
     "%05d" to open a file family.
 
   Deprecated Options
-    The following options have been deprecated in HDF5. While they remain
-    available, they have been superseded as indicated and may be removed
-    from HDF5 in the future. Use the indicated replacement option in all
-    new work; where possible, existing scripts, et cetera, should also be
-    updated to use the replacement option.
+    The following options have been removed in HDF5 1.12. Use the indicated
+    replacement option in all work.
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
diff --git a/tools/testfiles/help-3.ls b/tools/testfiles/help-3.ls
index 396bed3..7409c16 100644
--- a/tools/testfiles/help-3.ls
+++ b/tools/testfiles/help-3.ls
@@ -20,7 +20,7 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
    --no-dangling-links
                    Must be used with --follow-symlinks option;
                    otherwise, h5ls shows error message and returns an exit
-                   code of 1. 
+                   code of 1.
                    Check for any symbolic links (soft links or external links)
                    that do not resolve to an existing object (dataset, group,
                    or named datatype).
@@ -55,11 +55,8 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
     "%05d" to open a file family.
 
   Deprecated Options
-    The following options have been deprecated in HDF5. While they remain
-    available, they have been superseded as indicated and may be removed
-    from HDF5 in the future. Use the indicated replacement option in all
-    new work; where possible, existing scripts, et cetera, should also be
-    updated to use the replacement option.
+    The following options have been removed in HDF5 1.12. Use the indicated
+    replacement option in all work.
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
diff --git a/tools/testfiles/tattrreg_be.ls b/tools/testfiles/tattrreg_be.ls
index 3962c93..0c9dc18 100644
--- a/tools/testfiles/tattrreg_be.ls
+++ b/tools/testfiles/tattrreg_be.ls
@@ -2,10 +2,19 @@ Opened "tattrreg.h5" with sec2 driver.
 Dataset1                 Dataset {NULL}
     Attribute: Attribute1 {4}
         Type:      dataset region reference
-        Data:  DSET-/Dataset2 {Blk0: (2,2)-(7,7)}
-               DSET-/Dataset2 {Pt0: (6,9), Pt1: (2,2), Pt2: (8,4), Pt3: (1,6),
-                Pt4: (2,8), Pt5: (3,2), Pt6: (0,4), Pt7: (9,0), Pt8: (7,1),
-                Pt9: (3,3)}
+        Data:
+               DATASET tattrreg.h5/Dataset2 {
+                  REGION_TYPE BLOCK  Blk0: (2,2)-(7,7)
+                  DATATYPE  H5T_STD_U8BE
+                  DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+               }
+               DATASET tattrreg.h5/Dataset2 {
+                  REGION_TYPE POINT  Pt0: (6,9), Pt1: (2,2), Pt2: (8,4),
+                    Pt3: (1,6), Pt4: (2,8), Pt5: (3,2), Pt6: (0,4),
+                    Pt7: (9,0), Pt8: (7,1), Pt9: (3,3)
+                  DATATYPE  H5T_STD_U8BE
+                  DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+               }
               NULL
               NULL
     Location:  1:1400
diff --git a/tools/testfiles/tattrreg_le.ls b/tools/testfiles/tattrreg_le.ls
index 13fb320..d44b7ed 100644
--- a/tools/testfiles/tattrreg_le.ls
+++ b/tools/testfiles/tattrreg_le.ls
@@ -2,10 +2,19 @@ Opened "tattrreg.h5" with sec2 driver.
 Dataset1                 Dataset {NULL}
     Attribute: Attribute1 {4}
         Type:      dataset region reference
-        Data:  DSET-/Dataset2 {Blk0: (2,2)-(7,7)}
-               DSET-/Dataset2 {Pt0: (6,9), Pt1: (2,2), Pt2: (8,4), Pt3: (1,6),
-                Pt4: (2,8), Pt5: (3,2), Pt6: (0,4), Pt7: (9,0), Pt8: (7,1),
-                Pt9: (3,3)}
+        Data:
+               DATASET tattrreg.h5/Dataset2 {
+                  REGION_TYPE BLOCK  Blk0: (2,2)-(7,7)
+                  DATATYPE  H5T_STD_U8BE
+                  DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+               }
+               DATASET tattrreg.h5/Dataset2 {
+                  REGION_TYPE POINT  Pt0: (6,9), Pt1: (2,2), Pt2: (8,4),
+                    Pt3: (1,6), Pt4: (2,8), Pt5: (3,2), Pt6: (0,4),
+                    Pt7: (9,0), Pt8: (7,1), Pt9: (3,3)
+                  DATATYPE  H5T_STD_U8BE
+                  DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+               }
               NULL
               NULL
     Location:  1:1400
diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/testfiles/textlinksrc-nodangle-1.ls
index 396bed3..7409c16 100644
--- a/tools/testfiles/textlinksrc-nodangle-1.ls
+++ b/tools/testfiles/textlinksrc-nodangle-1.ls
@@ -20,7 +20,7 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
    --no-dangling-links
                    Must be used with --follow-symlinks option;
                    otherwise, h5ls shows error message and returns an exit
-                   code of 1. 
+                   code of 1.
                    Check for any symbolic links (soft links or external links)
                    that do not resolve to an existing object (dataset, group,
                    or named datatype).
@@ -55,11 +55,8 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
     "%05d" to open a file family.
 
   Deprecated Options
-    The following options have been deprecated in HDF5. While they remain
-    available, they have been superseded as indicated and may be removed
-    from HDF5 in the future. Use the indicated replacement option in all
-    new work; where possible, existing scripts, et cetera, should also be
-    updated to use the replacement option.
+    The following options have been removed in HDF5 1.12. Use the indicated
+    replacement option in all work.
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.
diff --git a/tools/testfiles/tgroup-1.ls b/tools/testfiles/tgroup-1.ls
index 396bed3..7409c16 100644
--- a/tools/testfiles/tgroup-1.ls
+++ b/tools/testfiles/tgroup-1.ls
@@ -20,7 +20,7 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
    --no-dangling-links
                    Must be used with --follow-symlinks option;
                    otherwise, h5ls shows error message and returns an exit
-                   code of 1. 
+                   code of 1.
                    Check for any symbolic links (soft links or external links)
                    that do not resolve to an existing object (dataset, group,
                    or named datatype).
@@ -55,11 +55,8 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
     "%05d" to open a file family.
 
   Deprecated Options
-    The following options have been deprecated in HDF5. While they remain
-    available, they have been superseded as indicated and may be removed
-    from HDF5 in the future. Use the indicated replacement option in all
-    new work; where possible, existing scripts, et cetera, should also be
-    updated to use the replacement option.
+    The following options have been removed in HDF5 1.12. Use the indicated
+    replacement option in all work.
 
    -E or --external   Follow external links.
                       Replaced by --follow-symlinks.