[svn-r21629] Purpose: Update fix committed in r21556

Description:
An old patch was mistakenly committed in r21556.  Replaced this fix with the
latest.

Tested: jam, koala, heiwa (h5committest)

1 files changed, 87 insertions, 87 deletions

diff --git a/tools/h5copy/testfiles/h5copytst.out.ls b/tools/h5copy/testfiles/h5copytst.out.ls
index af6cd8f..6598c8f 100644
--- a/tools/h5copy/testfiles/h5copytst.out.ls
+++ b/tools/h5copy/testfiles/h5copytst.out.ls
@@ -6,57 +6,57 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
     Location:  1:96
     Links:     1
 /A                       Group
-    Location:  1:90032
+    Location:  1:88336
     Links:     1
 /A/B1                    Group
-    Location:  1:90736
+    Location:  1:89040
     Links:     1
 /A/B1/simple             Dataset {6/6}
-    Location:  1:89904
+    Location:  1:88208
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /A/B2                    Group
-    Location:  1:94272
+    Location:  1:92576
     Links:     1
 /A/B2/simple2            Dataset {6/6}
-    Location:  1:94144
+    Location:  1:92448
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /C                       Group
-    Location:  1:97480
+    Location:  1:95784
     Links:     1
 /C/D                     Group
-    Location:  1:98184
+    Location:  1:96488
     Links:     1
 /C/D/simple              Dataset {6/6}
-    Location:  1:97352
+    Location:  1:95656
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E                       Group
-    Location:  1:112096
+    Location:  1:110400
     Links:     1
 /E/F                     Group
-    Location:  1:112800
+    Location:  1:111104
     Links:     1
 /E/F/grp_dsets           Group
-    Location:  1:100296
+    Location:  1:98600
     Links:     1
 /E/F/grp_dsets/chunk     Dataset {6/6}
-    Location:  1:104480
+    Location:  1:102784
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compact   Dataset {6/6}
-    Location:  1:104936
+    Location:  1:103240
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compound  Dataset {2/2}
-    Location:  1:105072
+    Location:  1:103376
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -64,60 +64,60 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /E/F/grp_dsets/compressed Dataset {6/6}
-    Location:  1:107384
+    Location:  1:105688
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/named_vl  Dataset {2/2}
-    Location:  1:111696
+    Location:  1:109952
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:107552 variable length of
+    Type:      shared-1:110080 variable length of
                    32-bit little-endian integer
 /E/F/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:111824
+    Location:  1:110128
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /E/F/grp_dsets/simple    Dataset {6/6}
-    Location:  1:111968
+    Location:  1:110272
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/vl        Type
-    Location:  1:107552
+    Location:  1:110080
     Links:     2
-    Type:      shared-1:107552 variable length of
+    Type:      shared-1:110080 variable length of
                    32-bit little-endian integer
 /G                       Group
-    Location:  1:127744
+    Location:  1:126048
     Links:     1
 /G/H                     Group
-    Location:  1:128448
+    Location:  1:126752
     Links:     1
 /G/H/grp_nested          Group
-    Location:  1:114824
+    Location:  1:113128
     Links:     1
 /G/H/grp_nested/grp_dsets Group
-    Location:  1:115616
+    Location:  1:113920
     Links:     1
 /G/H/grp_nested/grp_dsets/chunk Dataset {6/6}
-    Location:  1:119800
+    Location:  1:118104
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compact Dataset {6/6}
-    Location:  1:120256
+    Location:  1:118560
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compound Dataset {2/2}
-    Location:  1:120392
+    Location:  1:118696
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -125,34 +125,34 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /G/H/grp_nested/grp_dsets/compressed Dataset {6/6}
-    Location:  1:122704
+    Location:  1:121008
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:127016
+    Location:  1:125272
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:122872 variable length of
+    Type:      shared-1:125400 variable length of
                    32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:127144
+    Location:  1:125448
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/simple Dataset {6/6}
-    Location:  1:127288
+    Location:  1:125592
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/vl Type
-    Location:  1:122872
+    Location:  1:125400
     Links:     2
-    Type:      shared-1:122872 variable length of
+    Type:      shared-1:125400 variable length of
                    32-bit little-endian integer
 /chunk                   Dataset {6/6}
     Location:  1:6312
@@ -181,21 +181,21 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_dsets               Group
-    Location:  1:33856
+    Location:  1:32160
     Links:     1
 /grp_dsets/chunk         Dataset {6/6}
-    Location:  1:38040
+    Location:  1:36344
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/compact       Dataset {6/6}
-    Location:  1:38496
+    Location:  1:36800
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/compound      Dataset {2/2}
-    Location:  1:38632
+    Location:  1:36936
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -203,62 +203,62 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_dsets/compressed    Dataset {6/6}
-    Location:  1:40944
+    Location:  1:39248
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_dsets/named_vl      Dataset {2/2}
-    Location:  1:45256
+    Location:  1:43512
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:41112 variable length of
+    Type:      shared-1:43640 variable length of
                    32-bit little-endian integer
 /grp_dsets/nested_vl     Dataset {2/2}
-    Location:  1:45384
+    Location:  1:43688
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_dsets/simple        Dataset {6/6}
-    Location:  1:45528
+    Location:  1:43832
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/simple_group  Dataset {6/6}
-    Location:  1:61640
+    Location:  1:59944
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_dsets/vl            Type
-    Location:  1:41112
+    Location:  1:43640
     Links:     2
-    Type:      shared-1:41112 variable length of
+    Type:      shared-1:43640 variable length of
                    32-bit little-endian integer
 /grp_empty               Group
-    Location:  1:33064
+    Location:  1:31368
     Links:     1
 /grp_nested              Group
-    Location:  1:46320
+    Location:  1:44624
     Links:     1
 /grp_nested/grp_dsets    Group
-    Location:  1:47112
+    Location:  1:45416
     Links:     1
 /grp_nested/grp_dsets/chunk Dataset {6/6}
-    Location:  1:51296
+    Location:  1:49600
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/compact Dataset {6/6}
-    Location:  1:51752
+    Location:  1:50056
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/compound Dataset {2/2}
-    Location:  1:51888
+    Location:  1:50192
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -266,51 +266,51 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_nested/grp_dsets/compressed Dataset {6/6}
-    Location:  1:54200
+    Location:  1:52504
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:58512
+    Location:  1:56768
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:54368 variable length of
+    Type:      shared-1:56896 variable length of
                    32-bit little-endian integer
 /grp_nested/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:58640
+    Location:  1:56944
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_nested/grp_dsets/simple Dataset {6/6}
-    Location:  1:58784
+    Location:  1:57088
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/vl Type
-    Location:  1:54368
+    Location:  1:56896
     Links:     2
-    Type:      shared-1:54368 variable length of
+    Type:      shared-1:56896 variable length of
                    32-bit little-endian integer
 /grp_rename              Group
-    Location:  1:62848
+    Location:  1:61152
     Links:     1
 /grp_rename/chunk        Dataset {6/6}
-    Location:  1:67032
+    Location:  1:65336
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/compact      Dataset {6/6}
-    Location:  1:67488
+    Location:  1:65792
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/compound     Dataset {2/2}
-    Location:  1:67624
+    Location:  1:65928
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -318,28 +318,28 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_rename/compressed   Dataset {6/6}
-    Location:  1:69936
+    Location:  1:68240
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets    Group
-    Location:  1:75728
+    Location:  1:74032
     Links:     1
 /grp_rename/grp_dsets/chunk Dataset {6/6}
-    Location:  1:79912
+    Location:  1:78216
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/compact Dataset {6/6}
-    Location:  1:80368
+    Location:  1:78672
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/compound Dataset {2/2}
-    Location:  1:80504
+    Location:  1:78808
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -347,73 +347,73 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_rename/grp_dsets/compressed Dataset {6/6}
-    Location:  1:82816
+    Location:  1:81120
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:87128
+    Location:  1:85384
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:82984 variable length of
+    Type:      shared-1:85512 variable length of
                    32-bit little-endian integer
 /grp_rename/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:87256
+    Location:  1:85560
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_rename/grp_dsets/simple Dataset {6/6}
-    Location:  1:87400
+    Location:  1:85704
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/vl Type
-    Location:  1:82984
+    Location:  1:85512
     Links:     2
-    Type:      shared-1:82984 variable length of
+    Type:      shared-1:85512 variable length of
                    32-bit little-endian integer
 /grp_rename/named_vl     Dataset {2/2}
-    Location:  1:74248
+    Location:  1:72504
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:70104 variable length of
+    Type:      shared-1:72632 variable length of
                    32-bit little-endian integer
 /grp_rename/nested_vl    Dataset {2/2}
-    Location:  1:74376
+    Location:  1:72680
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_rename/simple       Dataset {6/6}
-    Location:  1:74520
+    Location:  1:72824
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /grp_rename/vl           Type
-    Location:  1:70104
+    Location:  1:72632
     Links:     2
-    Type:      shared-1:70104 variable length of
+    Type:      shared-1:72632 variable length of
                    32-bit little-endian integer
 /named_vl                Dataset {2/2}
-    Location:  1:13200
+    Location:  1:19296
     Links:     1
     Storage:   <details removed for portability>
-    Type:      shared-1:13152 variable length of
+    Type:      shared-1:19424 variable length of
                    32-bit little-endian integer
 /nested_vl               Dataset {2/2}
-    Location:  1:27488
+    Location:  1:25792
     Links:     1
     Storage:   <details removed for portability>
     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /rename                  Dataset {2/2}
-    Location:  1:31856
+    Location:  1:30160
     Links:     1
     Storage:   <details removed for portability>
     Type:      struct {
@@ -426,7 +426,7 @@ Opened "./testfiles/h5copytst.out.h5" with sec2 driver.
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /simple_top              Dataset {6/6}
-    Location:  1:29680
+    Location:  1:27984
     Links:     1
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer