[svn-r21953] HDDFV-7560: h5dump refactoring

Tested: local linux

1 files changed, 11 insertions, 35 deletions

diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/testfiles/tcompound_complex.h5.xml
index bda8c94..b35193a 100644
--- a/tools/testfiles/tcompound_complex.h5.xml
+++ b/tools/testfiles/tcompound_complex.h5.xml
@@ -5,12 +5,12 @@
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
-         <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late">
+      <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late">
          <hdf5:FillValue>
-               <hdf5:Data>
-                  <!-- Compound fill not yet implemented. -->
-                  <hdf5:NoData />
-               </hdf5:Data>
+            <hdf5:Data>
+               <!-- Compound fill not yet implemented. -->
+               <hdf5:NoData />
+            </hdf5:Data>
          </hdf5:FillValue>
       </hdf5:FillValueInfo>
       <hdf5:Dataspace>
@@ -90,36 +90,12 @@
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!"  0 1 2 3 4 5
-               1 2 3 4 5 6
-               2 3 4 5 6 7
-               3 4 5 6 7 8
-               4 5 6 7 8 9 0  0 0 0 0 0 0 0 0 0 0 109
-         1  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!"  1 2 3 4 5 6
-               2 3 4 5 6 7
-               3 4 5 6 7 8
-               4 5 6 7 8 9
-               5 6 7 8 9 10 0.96  1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 109
-         2  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!"  2 3 4 5 6 7
-               3 4 5 6 7 8
-               4 5 6 7 8 9
-               5 6 7 8 9 10
-               6 7 8 9 10 11 1.92  2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 109
-         3  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!"  3 4 5 6 7 8
-               4 5 6 7 8 9
-               5 6 7 8 9 10
-               6 7 8 9 10 11
-               7 8 9 10 11 12 2.88  3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 109
-         4  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!"  4 5 6 7 8 9
-               5 6 7 8 9 10
-               6 7 8 9 10 11
-               7 8 9 10 11 12
-               8 9 10 11 12 13 3.84  4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 109
-         5  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!"  5 6 7 8 9 10
-               6 7 8 9 10 11
-               7 8 9 10 11 12
-               8 9 10 11 12 13
-               9 10 11 12 13 14 4.8  5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 109
+         0 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!" 0 1 2 3 4 5 1 2 3 4 5 6 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 0 0 0 0 0 0 0 0 0 0 0 109
+         1 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!" 1 2 3 4 5 6 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 0.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 109
+         2 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!" 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 1.92 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 109
+         3 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!" 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 2.88 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 109
+         4 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!" 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 3.84 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 109
+         5 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing" "Hello!" 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 4.8 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 109
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>