[svn-r16024] For scalar string datasets print the character position when a difference is found instead of a non-existing array position

Tested: windows

1 files changed, 126 insertions, 126 deletions

diff --git a/tools/h5diff/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt
index 127ddb2..ad07ffa 100644
--- a/tools/h5diff/testfiles/h5diff_80.txt
+++ b/tools/h5diff/testfiles/h5diff_80.txt
@@ -57,79 +57,79 @@ dataset: </g1/VLstring> and </g1/VLstring>
 size:           [2]           [2]
 position        VLstring        VLstring        difference          
 ------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
+[ 0 ]            a            z
+[ 0 ]            b            z
+[ 1 ]            d            z
+[ 1 ]            e            z
 4 differences found
 dataset: </g1/VLstring2D> and </g1/VLstring2D>
 size:           [3x2]           [3x2]
 position        VLstring2D      VLstring2D      difference          
 ------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
+[ 0 0 ]            a            z
+[ 0 0 ]            b            z
+[ 0 1 ]            c            z
+[ 0 1 ]            d            z
+[ 1 0 ]            e            z
+[ 1 0 ]            f            z
+[ 1 1 ]            g            z
+[ 1 1 ]            h            z
+[ 2 0 ]            i            z
+[ 2 0 ]            j            z
+[ 2 1 ]            k            z
+[ 2 1 ]            l            z
 12 differences found
 dataset: </g1/VLstring3D> and </g1/VLstring3D>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D      VLstring3D      difference          
 ------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
+[ 0 0 0 ]            a            z
+[ 0 0 0 ]            b            z
+[ 0 0 1 ]            c            z
+[ 0 0 1 ]            d            z
+[ 0 1 0 ]            e            z
+[ 0 1 0 ]            f            z
+[ 0 1 1 ]            g            z
+[ 0 1 1 ]            h            z
+[ 0 2 0 ]            i            z
+[ 0 2 0 ]            j            z
+[ 0 2 1 ]            k            z
+[ 0 2 1 ]            l            z
+[ 1 0 0 ]            m            z
+[ 1 0 0 ]            n            z
+[ 1 0 1 ]            p            z
+[ 1 0 1 ]            q            z
+[ 1 1 0 ]            r            z
+[ 1 1 0 ]            s            z
+[ 1 1 1 ]            t            z
+[ 1 1 1 ]            u            z
+[ 1 2 0 ]            v            z
+[ 1 2 0 ]            w            z
+[ 1 2 1 ]            x            z
+[ 2 0 0 ]            A            z
+[ 2 0 0 ]            B            z
+[ 2 0 1 ]            C            z
+[ 2 0 1 ]            D            z
+[ 2 1 0 ]            E            z
+[ 2 1 0 ]            F            z
+[ 2 1 1 ]            G            z
+[ 2 1 1 ]            H            z
+[ 2 2 0 ]            I            z
+[ 2 2 0 ]            J            z
+[ 2 2 1 ]            K            z
+[ 2 2 1 ]            L            z
+[ 3 0 0 ]            M            z
+[ 3 0 0 ]            N            z
+[ 3 0 1 ]            P            z
+[ 3 0 1 ]            Q            z
+[ 3 1 0 ]            R            z
+[ 3 1 0 ]            S            z
+[ 3 1 1 ]            T            z
+[ 3 1 1 ]            U            z
+[ 3 2 0 ]            V            z
+[ 3 2 0 ]            W            z
+[ 3 2 1 ]            X            z
+[ 3 2 1 ]            Z            z
 47 differences found
 dataset: </g1/array> and </g1/array>
 size:           [2]           [2]
@@ -691,79 +691,79 @@ dataset: </g1/string> and </g1/string>
 size:           [2]           [2]
 position        string          string          difference          
 ------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
+[ 0 ]            a            z
+[ 0 ]            b            z
+[ 1 ]            d            z
+[ 1 ]            e            z
 4 differences found
 dataset: </g1/string2D> and </g1/string2D>
 size:           [3x2]           [3x2]
 position        string2D        string2D        difference          
 ------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
+[ 0 0 ]            a            z
+[ 0 0 ]            b            z
+[ 0 1 ]            c            z
+[ 0 1 ]            d            z
+[ 1 0 ]            e            z
+[ 1 0 ]            f            z
+[ 1 1 ]            g            z
+[ 1 1 ]            h            z
+[ 2 0 ]            i            z
+[ 2 0 ]            j            z
+[ 2 1 ]            k            z
+[ 2 1 ]            l            z
 12 differences found
 dataset: </g1/string3D> and </g1/string3D>
 size:           [4x3x2]           [4x3x2]
 position        string3D        string3D        difference          
 ------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
+[ 0 0 0 ]            a            z
+[ 0 0 0 ]            b            z
+[ 0 0 1 ]            c            z
+[ 0 0 1 ]            d            z
+[ 0 1 0 ]            e            z
+[ 0 1 0 ]            f            z
+[ 0 1 1 ]            g            z
+[ 0 1 1 ]            h            z
+[ 0 2 0 ]            i            z
+[ 0 2 0 ]            j            z
+[ 0 2 1 ]            k            z
+[ 0 2 1 ]            l            z
+[ 1 0 0 ]            m            z
+[ 1 0 0 ]            n            z
+[ 1 0 1 ]            p            z
+[ 1 0 1 ]            q            z
+[ 1 1 0 ]            r            z
+[ 1 1 0 ]            s            z
+[ 1 1 1 ]            t            z
+[ 1 1 1 ]            u            z
+[ 1 2 0 ]            v            z
+[ 1 2 0 ]            w            z
+[ 1 2 1 ]            x            z
+[ 2 0 0 ]            A            z
+[ 2 0 0 ]            B            z
+[ 2 0 1 ]            C            z
+[ 2 0 1 ]            D            z
+[ 2 1 0 ]            E            z
+[ 2 1 0 ]            F            z
+[ 2 1 1 ]            G            z
+[ 2 1 1 ]            H            z
+[ 2 2 0 ]            I            z
+[ 2 2 0 ]            J            z
+[ 2 2 1 ]            K            z
+[ 2 2 1 ]            L            z
+[ 3 0 0 ]            M            z
+[ 3 0 0 ]            N            z
+[ 3 0 1 ]            P            z
+[ 3 0 1 ]            Q            z
+[ 3 1 0 ]            R            z
+[ 3 1 0 ]            S            z
+[ 3 1 1 ]            T            z
+[ 3 1 1 ]            U            z
+[ 3 2 0 ]            V            z
+[ 3 2 0 ]            W            z
+[ 3 2 1 ]            X            z
+[ 3 2 1 ]            Z            z
 47 differences found
 dataset: </g1/vlen> and </g1/vlen>
 size:           [2]           [2]