[svn-r8912] Purpose:

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

View File

@@ -7,50 +7,51 @@ file1 file2
x x /dset
x x /g1
</dset> and </dset> are empty datasets
Dataset: </dset> and </dset>
</dset> and </dset> are empty datasets
Group: </g1> and </g1>
Attribute: <string of </g1>> and <string of </g1>>
position string of </g1> string of </g1> difference
------------------------------------------------------------
[ 0 ] a z
[ 0 ] b z
[ 1 ] d z
[ 1 ] e z
Attribute: <string of </g1>> and <string of </g1>>
4 differences found
Attribute: <bitfield of </g1>> and <bitfield of </g1>>
position bitfield of </g1> bitfield of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Attribute: <bitfield of </g1>> and <bitfield of </g1>>
2 differences found
Attribute: <opaque of </g1>> and <opaque of </g1>>
position opaque of </g1> opaque of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Attribute: <opaque of </g1>> and <opaque of </g1>>
2 differences found
Attribute: <compound of </g1>> and <compound of </g1>>
position compound of </g1> compound of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2.000000 0.000000 2.000000
[ 1 ] 3 0 3
[ 1 ] 4.000000 0.000000 4.000000
Attribute: <compound of </g1>> and <compound of </g1>>
4 differences found
Attribute: <enum of </g1>> and <enum of </g1>>
position enum of </g1> enum of </g1> difference
------------------------------------------------------------
[ 0 ] RED GREEN
[ 1 ] RED GREEN
Attribute: <enum of </g1>> and <enum of </g1>>
2 differences found
Attribute: <vlen of </g1>> and <vlen of </g1>>
position vlen of </g1> vlen of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
Attribute: <vlen of </g1>> and <vlen of </g1>>
3 differences found
Attribute: <array of </g1>> and <array of </g1>>
position array of </g1> array of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -59,20 +60,20 @@ position array of </g1> array of </g1> difference
[ 1 ] 4 0 4
[ 1 ] 5 0 5
[ 1 ] 6 0 6
Attribute: <array of </g1>> and <array of </g1>>
6 differences found
Attribute: <integer of </g1>> and <integer of </g1>>
position integer of </g1> integer of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Attribute: <integer of </g1>> and <integer of </g1>>
2 differences found
Attribute: <float of </g1>> and <float of </g1>>
position float of </g1> float of </g1> difference
------------------------------------------------------------
[ 0 ] 1.000000 0.000000 1.000000
[ 1 ] 2.000000 0.000000 2.000000
Attribute: <float of </g1>> and <float of </g1>>
2 differences found
Attribute: <string2D of </g1>> and <string2D of </g1>>
position string2D of </g1> string2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] a z
@@ -87,8 +88,8 @@ position string2D of </g1> string2D of </g1> difference
[ 2 0 ] j z
[ 2 1 ] k z
[ 2 1 ] l z
Attribute: <string2D of </g1>> and <string2D of </g1>>
12 differences found
Attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
position bitfield2D of </g1> bitfield2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -97,8 +98,8 @@ position bitfield2D of </g1> bitfield2D of </g1> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
6 differences found
Attribute: <opaque2D of </g1>> and <opaque2D of </g1>>
position opaque2D of </g1> opaque2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -107,8 +108,8 @@ position opaque2D of </g1> opaque2D of </g1> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Attribute: <opaque2D of </g1>> and <opaque2D of </g1>>
6 differences found
Attribute: <compound2D of </g1>> and <compound2D of </g1>>
position compound2D of </g1> compound2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -123,8 +124,8 @@ position compound2D of </g1> compound2D of </g1> difference
[ 2 0 ] 10.000000 0.000000 10.000000
[ 2 1 ] 11 0 11
[ 2 1 ] 12.000000 0.000000 12.000000
Attribute: <compound2D of </g1>> and <compound2D of </g1>>
12 differences found
Attribute: <enum2D of </g1>> and <enum2D of </g1>>
position enum2D of </g1> enum2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] RED GREEN
@@ -133,8 +134,8 @@ position enum2D of </g1> enum2D of </g1> difference
[ 1 1 ] RED GREEN
[ 2 0 ] RED GREEN
[ 2 1 ] RED GREEN
Attribute: <enum2D of </g1>> and <enum2D of </g1>>
6 differences found
Attribute: <vlen2D of </g1>> and <vlen2D of </g1>>
position vlen2D of </g1> vlen2D of </g1> difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
@@ -148,8 +149,8 @@ position vlen2D of </g1> vlen2D of </g1> difference
[ 2 1 ] 9 0 9
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
Attribute: <vlen2D of </g1>> and <vlen2D of </g1>>
11 differences found
Attribute: <array2D of </g1>> and <array2D of </g1>>
position array2D of </g1> array2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -170,8 +171,8 @@ position array2D of </g1> array2D of </g1> difference
[ 2 1 ] 16 0 16
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
Attribute: <array2D of </g1>> and <array2D of </g1>>
18 differences found
Attribute: <integer2D of </g1>> and <integer2D of </g1>>
position integer2D of </g1> integer2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -180,8 +181,8 @@ position integer2D of </g1> integer2D of </g1> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Attribute: <integer2D of </g1>> and <integer2D of </g1>>
6 differences found
Attribute: <float2D of </g1>> and <float2D of </g1>>
position float2D of </g1> float2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1.000000 0.000000 1.000000
@@ -190,8 +191,8 @@ position float2D of </g1> float2D of </g1> 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
Attribute: <float2D of </g1>> and <float2D of </g1>>
6 differences found
Attribute: <string3D of </g1>> and <string3D of </g1>>
position string3D of </g1> string3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] a z
@@ -241,8 +242,8 @@ position string3D of </g1> string3D of </g1> difference
[ 3 2 0 ] W z
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
Attribute: <string3D of </g1>> and <string3D of </g1>>
47 differences found
Attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
position bitfield3D of </g1> bitfield3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -269,8 +270,8 @@ position bitfield3D of </g1> bitfield3D of </g1> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
24 differences found
Attribute: <opaque3D of </g1>> and <opaque3D of </g1>>
position opaque3D of </g1> opaque3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -297,8 +298,8 @@ position opaque3D of </g1> opaque3D of </g1> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Attribute: <opaque3D of </g1>> and <opaque3D of </g1>>
24 differences found
Attribute: <compound3D of </g1>> and <compound3D of </g1>>
position compound3D of </g1> compound3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -349,8 +350,8 @@ position compound3D of </g1> compound3D of </g1> 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
Attribute: <compound3D of </g1>> and <compound3D of </g1>>
48 differences found
Attribute: <enum3D of </g1>> and <enum3D of </g1>>
position enum3D of </g1> enum3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] GREEN RED
@@ -377,8 +378,8 @@ position enum3D of </g1> enum3D of </g1> difference
[ 3 1 1 ] GREEN RED
[ 3 2 0 ] GREEN RED
[ 3 2 1 ] GREEN RED
Attribute: <enum3D of </g1>> and <enum3D of </g1>>
24 differences found
Attribute: <vlen3D of </g1>> and <vlen3D of </g1>>
position vlen3D of </g1> vlen3D of </g1> difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
@@ -440,8 +441,8 @@ position vlen3D of </g1> vlen3D of </g1> difference
[ 3 2 1 ] 57 0 57
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
Attribute: <vlen3D of </g1>> and <vlen3D of </g1>>
59 differences found
Attribute: <array3D of </g1>> and <array3D of </g1>>
position array3D of </g1> array3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -516,8 +517,8 @@ position array3D of </g1> array3D of </g1> difference
[ 3 2 1 ] 70 0 70
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
Attribute: <array3D of </g1>> and <array3D of </g1>>
72 differences found
Attribute: <integer3D of </g1>> and <integer3D of </g1>>
position integer3D of </g1> integer3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -544,8 +545,8 @@ position integer3D of </g1> integer3D of </g1> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Attribute: <integer3D of </g1>> and <integer3D of </g1>>
24 differences found
Attribute: <float3D of </g1>> and <float3D of </g1>>
position float3D of </g1> float3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1.000000 0.000000 1.000000
@@ -572,50 +573,50 @@ position float3D of </g1> float3D of </g1> 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
Attribute: <float3D of </g1>> and <float3D of </g1>>
24 differences found
Group: </> and </>
Attribute: <string of </>> and <string of </>>
position string of </> string of </> difference
------------------------------------------------------------
[ 0 ] a z
[ 0 ] b z
[ 1 ] d z
[ 1 ] e z
Attribute: <string of </>> and <string of </>>
4 differences found
Attribute: <bitfield of </>> and <bitfield of </>>
position bitfield of </> bitfield of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Attribute: <bitfield of </>> and <bitfield of </>>
2 differences found
Attribute: <opaque of </>> and <opaque of </>>
position opaque of </> opaque of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Attribute: <opaque of </>> and <opaque of </>>
2 differences found
Attribute: <compound of </>> and <compound of </>>
position compound of </> compound of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2.000000 0.000000 2.000000
[ 1 ] 3 0 3
[ 1 ] 4.000000 0.000000 4.000000
Attribute: <compound of </>> and <compound of </>>
4 differences found
Attribute: <enum of </>> and <enum of </>>
position enum of </> enum of </> difference
------------------------------------------------------------
[ 0 ] RED GREEN
[ 1 ] RED GREEN
Attribute: <enum of </>> and <enum of </>>
2 differences found
Attribute: <vlen of </>> and <vlen of </>>
position vlen of </> vlen of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
Attribute: <vlen of </>> and <vlen of </>>
3 differences found
Attribute: <array of </>> and <array of </>>
position array of </> array of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -624,20 +625,20 @@ position array of </> array of </> difference
[ 1 ] 4 0 4
[ 1 ] 5 0 5
[ 1 ] 6 0 6
Attribute: <array of </>> and <array of </>>
6 differences found
Attribute: <integer of </>> and <integer of </>>
position integer of </> integer of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
Attribute: <integer of </>> and <integer of </>>
2 differences found
Attribute: <float of </>> and <float of </>>
position float of </> float of </> difference
------------------------------------------------------------
[ 0 ] 1.000000 0.000000 1.000000
[ 1 ] 2.000000 0.000000 2.000000
Attribute: <float of </>> and <float of </>>
2 differences found
Attribute: <string2D of </>> and <string2D of </>>
position string2D of </> string2D of </> difference
------------------------------------------------------------
[ 0 0 ] a z
@@ -652,8 +653,8 @@ position string2D of </> string2D of </> difference
[ 2 0 ] j z
[ 2 1 ] k z
[ 2 1 ] l z
Attribute: <string2D of </>> and <string2D of </>>
12 differences found
Attribute: <bitfield2D of </>> and <bitfield2D of </>>
position bitfield2D of </> bitfield2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -662,8 +663,8 @@ position bitfield2D of </> bitfield2D of </> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Attribute: <bitfield2D of </>> and <bitfield2D of </>>
6 differences found
Attribute: <opaque2D of </>> and <opaque2D of </>>
position opaque2D of </> opaque2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -672,8 +673,8 @@ position opaque2D of </> opaque2D of </> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Attribute: <opaque2D of </>> and <opaque2D of </>>
6 differences found
Attribute: <compound2D of </>> and <compound2D of </>>
position compound2D of </> compound2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -688,8 +689,8 @@ position compound2D of </> compound2D of </> difference
[ 2 0 ] 10.000000 0.000000 10.000000
[ 2 1 ] 11 0 11
[ 2 1 ] 12.000000 0.000000 12.000000
Attribute: <compound2D of </>> and <compound2D of </>>
12 differences found
Attribute: <enum2D of </>> and <enum2D of </>>
position enum2D of </> enum2D of </> difference
------------------------------------------------------------
[ 0 0 ] RED GREEN
@@ -698,8 +699,8 @@ position enum2D of </> enum2D of </> difference
[ 1 1 ] RED GREEN
[ 2 0 ] RED GREEN
[ 2 1 ] RED GREEN
Attribute: <enum2D of </>> and <enum2D of </>>
6 differences found
Attribute: <vlen2D of </>> and <vlen2D of </>>
position vlen2D of </> vlen2D of </> difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
@@ -713,8 +714,8 @@ position vlen2D of </> vlen2D of </> difference
[ 2 1 ] 9 0 9
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
Attribute: <vlen2D of </>> and <vlen2D of </>>
11 differences found
Attribute: <array2D of </>> and <array2D of </>>
position array2D of </> array2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -735,8 +736,8 @@ position array2D of </> array2D of </> difference
[ 2 1 ] 16 0 16
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
Attribute: <array2D of </>> and <array2D of </>>
18 differences found
Attribute: <integer2D of </>> and <integer2D of </>>
position integer2D of </> integer2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -745,8 +746,8 @@ position integer2D of </> integer2D of </> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
Attribute: <integer2D of </>> and <integer2D of </>>
6 differences found
Attribute: <float2D of </>> and <float2D of </>>
position float2D of </> float2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1.000000 0.000000 1.000000
@@ -755,8 +756,8 @@ position float2D of </> float2D of </> 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
Attribute: <float2D of </>> and <float2D of </>>
6 differences found
Attribute: <string3D of </>> and <string3D of </>>
position string3D of </> string3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] a z
@@ -806,8 +807,8 @@ position string3D of </> string3D of </> difference
[ 3 2 0 ] W z
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
Attribute: <string3D of </>> and <string3D of </>>
47 differences found
Attribute: <bitfield3D of </>> and <bitfield3D of </>>
position bitfield3D of </> bitfield3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -834,8 +835,8 @@ position bitfield3D of </> bitfield3D of </> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Attribute: <bitfield3D of </>> and <bitfield3D of </>>
24 differences found
Attribute: <opaque3D of </>> and <opaque3D of </>>
position opaque3D of </> opaque3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -862,8 +863,8 @@ position opaque3D of </> opaque3D of </> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Attribute: <opaque3D of </>> and <opaque3D of </>>
24 differences found
Attribute: <compound3D of </>> and <compound3D of </>>
position compound3D of </> compound3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -914,8 +915,8 @@ position compound3D of </> compound3D of </> 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
Attribute: <compound3D of </>> and <compound3D of </>>
48 differences found
Attribute: <enum3D of </>> and <enum3D of </>>
position enum3D of </> enum3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] GREEN RED
@@ -942,8 +943,8 @@ position enum3D of </> enum3D of </> difference
[ 3 1 1 ] GREEN RED
[ 3 2 0 ] GREEN RED
[ 3 2 1 ] GREEN RED
Attribute: <enum3D of </>> and <enum3D of </>>
24 differences found
Attribute: <vlen3D of </>> and <vlen3D of </>>
position vlen3D of </> vlen3D of </> difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
@@ -1005,8 +1006,8 @@ position vlen3D of </> vlen3D of </> difference
[ 3 2 1 ] 57 0 57
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
Attribute: <vlen3D of </>> and <vlen3D of </>>
59 differences found
Attribute: <array3D of </>> and <array3D of </>>
position array3D of </> array3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -1081,8 +1082,8 @@ position array3D of </> array3D of </> difference
[ 3 2 1 ] 70 0 70
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
Attribute: <array3D of </>> and <array3D of </>>
72 differences found
Attribute: <integer3D of </>> and <integer3D of </>>
position integer3D of </> integer3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -1109,8 +1110,8 @@ position integer3D of </> integer3D of </> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
Attribute: <integer3D of </>> and <integer3D of </>>
24 differences found
Attribute: <float3D of </>> and <float3D of </>>
position float3D of </> float3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1.000000 0.000000 1.000000
@@ -1137,6 +1138,5 @@ position float3D of </> float3D of </> 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
Attribute: <float3D of </>> and <float3D of </>>
24 differences found
0 differences found