philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r8912] Purpose:

Browse Source 
bug fixes

Description:

the return error code for a  function was not initialized.
in HP-UX  it happened that this variable was initialized to -1
causing the function to return with an error condtion
solution : initialized the variable to 0

the name of the dataset was printed after the differences in verbose mode
and report when differences were found
solution : check first if differences were found and then
print the name of dataset and differences
in verbose mode always print the name first

Solution:

Platforms tested:
linux
aix
solaris

Misc. update:
This commit is contained in:
Pedro Vicente Nunes
2004-07-21 12:50:49 -05:00
parent 50a853d807
commit 140dfae48a
18 changed files with 291 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
tools/testfiles/h5diff_80.txt
View File

@@ -37,12 +37,13 @@ file1 file2
x x /g1/vlen2D
x x /g1/vlen3D
Dataset: </dset> and </dset>
position dset dset difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </dset> and </dset>
Group: </g1> and </g1>
Dataset: </g1/array> and </g1/array>
position array array difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -51,7 +52,7 @@ position array array difference
[ 1 ] 4 0 4
[ 1 ] 5 0 5
[ 1 ] 6 0 6
Dataset: </g1/array> and </g1/array>
Dataset: </g1/array2D> and </g1/array2D>
position array2D array2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -72,7 +73,7 @@ position array2D array2D difference
[ 2 1 ] 16 0 16
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
Dataset: </g1/array2D> and </g1/array2D>
Dataset: </g1/array3D> and </g1/array3D>
position array3D array3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -147,12 +148,12 @@ position array3D array3D difference
[ 3 2 1 ] 70 0 70
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
Dataset: </g1/array3D> and </g1/array3D>
Dataset: </g1/bitfield> and </g1/bitfield>
position bitfield bitfield difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </g1/bitfield> and </g1/bitfield>
Dataset: </g1/bitfield2D> and </g1/bitfield2D>
position bitfield2D bitfield2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -161,7 +162,7 @@ position bitfield2D bitfield2D difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Dataset: </g1/bitfield2D> and </g1/bitfield2D>
Dataset: </g1/bitfield3D> and </g1/bitfield3D>
position bitfield3D bitfield3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -188,14 +189,14 @@ position bitfield3D bitfield3D difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Dataset: </g1/bitfield3D> and </g1/bitfield3D>
Dataset: </g1/compound> and </g1/compound>
position compound compound difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2.000000 0.000000 2.000000
[ 1 ] 3 0 3
[ 1 ] 4.000000 0.000000 4.000000
Dataset: </g1/compound> and </g1/compound>
Dataset: </g1/compound2D> and </g1/compound2D>
position compound2D compound2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -210,7 +211,7 @@ position compound2D compound2D difference
[ 2 0 ] 10.000000 0.000000 10.000000
[ 2 1 ] 11 0 11
[ 2 1 ] 12.000000 0.000000 12.000000
Dataset: </g1/compound2D> and </g1/compound2D>
Dataset: </g1/compound3D> and </g1/compound3D>
position compound3D compound3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -261,20 +262,20 @@ position compound3D compound3D difference
[ 3 2 0 ] 46.000000 0.000000 46.000000
[ 3 2 1 ] 47 0 47
[ 3 2 1 ] 48.000000 0.000000 48.000000
Dataset: </g1/compound3D> and </g1/compound3D>
Dataset: </g1/enum> and </g1/enum>
position enum enum difference
------------------------------------------------------------
[ 0 ] RED GREEN
Dataset: </g1/enum> and </g1/enum>
</g1/enum2D> and </g1/enum2D> are empty datasets
Dataset: </g1/enum2D> and </g1/enum2D>
</g1/enum3D> and </g1/enum3D> are empty datasets
</g1/enum2D> and </g1/enum2D> are empty datasets
Dataset: </g1/enum3D> and </g1/enum3D>
</g1/enum3D> and </g1/enum3D> are empty datasets
Dataset: </g1/float> and </g1/float>
position float float difference
------------------------------------------------------------
[ 0 ] 1.000000 0.000000 1.000000
[ 1 ] 2.000000 0.000000 2.000000
Dataset: </g1/float> and </g1/float>
Dataset: </g1/float2D> and </g1/float2D>
position float2D float2D difference
------------------------------------------------------------
[ 0 0 ] 1.000000 0.000000 1.000000
@@ -283,7 +284,7 @@ position float2D float2D difference
[ 1 1 ] 4.000000 0.000000 4.000000
[ 2 0 ] 5.000000 0.000000 5.000000
[ 2 1 ] 6.000000 0.000000 6.000000
Dataset: </g1/float2D> and </g1/float2D>
Dataset: </g1/float3D> and </g1/float3D>
position float3D float3D difference
------------------------------------------------------------
[ 0 0 0 ] 1.000000 0.000000 1.000000
@@ -310,12 +311,12 @@ position float3D float3D difference
[ 3 1 1 ] 22.000000 0.000000 22.000000
[ 3 2 0 ] 23.000000 0.000000 23.000000
[ 3 2 1 ] 24.000000 0.000000 24.000000
Dataset: </g1/float3D> and </g1/float3D>
Dataset: </g1/integer> and </g1/integer>
position integer integer difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </g1/integer> and </g1/integer>
Dataset: </g1/integer2D> and </g1/integer2D>
position integer2D integer2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -324,7 +325,7 @@ position integer2D integer2D difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Dataset: </g1/integer2D> and </g1/integer2D>
Dataset: </g1/integer3D> and </g1/integer3D>
position integer3D integer3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -351,12 +352,12 @@ position integer3D integer3D difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Dataset: </g1/integer3D> and </g1/integer3D>
Dataset: </g1/opaque> and </g1/opaque>
position opaque opaque difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </g1/opaque> and </g1/opaque>
Dataset: </g1/opaque2D> and </g1/opaque2D>
position opaque2D opaque2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -365,7 +366,7 @@ position opaque2D opaque2D difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Dataset: </g1/opaque2D> and </g1/opaque2D>
Dataset: </g1/opaque3D> and </g1/opaque3D>
position opaque3D opaque3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -392,15 +393,6 @@ position opaque3D opaque3D difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Dataset: </g1/opaque3D> and </g1/opaque3D>
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </g1/reference> and </g1/reference>
position difference
------------------------------------------------------------
@@ -410,22 +402,6 @@ position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </g1/reference2D> and </g1/reference2D>
position difference
------------------------------------------------------------
@@ -451,86 +427,111 @@ position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </g1/reference3D> and </g1/reference3D>
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Dataset: </g1/string> and </g1/string>
position string string difference
------------------------------------------------------------
[ 0 ] a z
[ 0 ] b z
[ 1 ] d z
[ 1 ] e z
Dataset: </g1/string> and </g1/string>
Dataset: </g1/string2D> and </g1/string2D>
position string2D string2D difference
------------------------------------------------------------
[ 0 0 ] a z
@@ -545,7 +546,7 @@ position string2D string2D difference
[ 2 0 ] j z
[ 2 1 ] k z
[ 2 1 ] l z
Dataset: </g1/string2D> and </g1/string2D>
Dataset: </g1/string3D> and </g1/string3D>
position string3D string3D difference
------------------------------------------------------------
[ 0 0 0 ] a z
@@ -595,13 +596,13 @@ position string3D string3D difference
[ 3 2 0 ] W z
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
Dataset: </g1/string3D> and </g1/string3D>
Dataset: </g1/vlen> and </g1/vlen>
position vlen vlen difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
Dataset: </g1/vlen> and </g1/vlen>
Dataset: </g1/vlen2D> and </g1/vlen2D>
position vlen2D vlen2D difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
@@ -615,7 +616,7 @@ position vlen2D vlen2D difference
[ 2 1 ] 9 0 9
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
Dataset: </g1/vlen2D> and </g1/vlen2D>
Dataset: </g1/vlen3D> and </g1/vlen3D>
position vlen3D vlen3D difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
@@ -677,6 +678,5 @@ position vlen3D vlen3D difference
[ 3 2 1 ] 57 0 57
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
Dataset: </g1/vlen3D> and </g1/vlen3D>
Group: </> and </>
491 differences found