[svn-r23898] HDFFV-8476: Add optional arg to -A for excluding attributes.

Merged from trunk.

Tested: local linux

9 files changed, 72 insertions, 0 deletions

diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 40510a4..b735b18 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters
diff --git a/tools/testfiles/tall-2A0.ddl b/tools/testfiles/tall-2A0.ddl
new file mode 100644
index 0000000..e0955f3
--- /dev/null
+++ b/tools/testfiles/tall-2A0.ddl
@@ -0,0 +1,64 @@
+HDF5 "tall.h5" {
+GROUP "/" {
+   GROUP "g1" {
+      GROUP "g1.1" {
+         DATASET "dset1.1.1" {
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+            DATA {
+            (0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            (1,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+            (2,0): 0, 2, 4, 6, 8, 10, 12, 14, 16, 18,
+            (3,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
+            (4,0): 0, 4, 8, 12, 16, 20, 24, 28, 32, 36,
+            (5,0): 0, 5, 10, 15, 20, 25, 30, 35, 40, 45,
+            (6,0): 0, 6, 12, 18, 24, 30, 36, 42, 48, 54,
+            (7,0): 0, 7, 14, 21, 28, 35, 42, 49, 56, 63,
+            (8,0): 0, 8, 16, 24, 32, 40, 48, 56, 64, 72,
+            (9,0): 0, 9, 18, 27, 36, 45, 54, 63, 72, 81
+            }
+         }
+         DATASET "dset1.1.2" {
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 20 ) / ( 20 ) }
+            DATA {
+            (0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+            (17): 17, 18, 19
+            }
+         }
+      }
+      GROUP "g1.2" {
+         EXTERNAL_LINK "extlink" {
+            TARGETFILE "somefile"
+            TARGETPATH "somepath"
+         }
+         GROUP "g1.2.1" {
+            SOFTLINK "slink" {
+               LINKTARGET "somevalue"
+            }
+         }
+      }
+   }
+   GROUP "g2" {
+      DATASET "dset2.1" {
+         DATATYPE  H5T_IEEE_F32BE
+         DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+         DATA {
+         (0): 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9
+         }
+      }
+      DATASET "dset2.2" {
+         DATATYPE  H5T_IEEE_F32BE
+         DATASPACE  SIMPLE { ( 3, 5 ) / ( 3, 5 ) }
+         DATA {
+         (0,0): 0, 0.1, 0.2, 0.3, 0.4,
+         (1,0): 0, 0.2, 0.4, 0.6, 0.8,
+         (2,0): 0, 0.3, 0.6, 0.9, 1.2
+         }
+      }
+      USERDEFINED_LINK "udlink" {
+         LINKCLASS 187
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index 440e3d9..e8d6d84 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index 758b6b4..06c5613 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index a85ba49..ffd9910 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index d5a1c88..a54812b 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index e24245c..1a8dd11 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index 8f58c47..7527131 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 6df8cce..21b573d 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -6,6 +6,7 @@ usage: h5dump [OPTIONS] files
      -B,   --superblock   Print the content of the super block
      -H,   --header       Print the header only; no data is displayed
      -A,   --onlyattr     Print the header and value of attributes
+                          Optional value 0 suppresses printing attributes.
      -i,   --object-ids   Print the object ids
      -r,   --string       Print 1-byte integer datasets as ASCII
      -e,   --escape       Escape non printing characters