diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-02-27 19:50:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-02-27 19:50:08 (GMT) |
| commit | 3013bf8bfa389b9d21cafa99980e8b88557e33fb (patch) | |
| tree | a1f33b403cf178aa28deb2f3089f90c697de797f | |
| parent | 6b12e9769f8e246d9abd8ed62a6d4fd8526b9fa5 (diff) | |
| download | hdf5-3013bf8bfa389b9d21cafa99980e8b88557e33fb.zip hdf5-3013bf8bfa389b9d21cafa99980e8b88557e33fb.tar.gz hdf5-3013bf8bfa389b9d21cafa99980e8b88557e33fb.tar.bz2 | |
[svn-r13420] Description:
Update the file offsets for files created with "latest version" flag of
h5mkgrp to reflect changes to superblock size.
Tested on:
Linux/32 2.6 (chicago)
Linux/64 2.6 (chicago2)
| -rw-r--r-- | src/H5Fsuper.c | 6 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_nested_latest.ls | 4 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_nested_mult_latest.ls | 8 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_several_latest.ls | 4 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_single_latest.ls | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index e24a8b2..10a949a 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -712,9 +712,9 @@ H5F_write_superblock(H5F_t *f, hid_t dxpl_id) *p++ = 0; /* reserved*/ *p++ = (uint8_t)share_head_vers; - assert (H5F_SIZEOF_ADDR(f) <= 255); + HDassert(H5F_SIZEOF_ADDR(f) <= 255); *p++ = (uint8_t)H5F_SIZEOF_ADDR(f); - assert (H5F_SIZEOF_SIZE(f) <= 255); + HDassert(H5F_SIZEOF_SIZE(f) <= 255); *p++ = (uint8_t)H5F_SIZEOF_SIZE(f); *p++ = 0; /* reserved */ @@ -741,7 +741,7 @@ H5F_write_superblock(H5F_t *f, hid_t dxpl_id) if(H5G_obj_ent_encode(f, &p, H5G_oloc(f->shared->root_grp)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to encode root group information") - /* Compute superblock checksum */ + /* Compute [possibly partial] superblock checksum */ if(super_vers >= HDF5_SUPERBLOCK_VERSION_2) chksum = H5_checksum_metadata(buf, (H5F_SUPERBLOCK_SIZE(super_vers, f) - H5F_SIZEOF_CHKSUM), 0); diff --git a/tools/testfiles/h5mkgrp_nested_latest.ls b/tools/testfiles/h5mkgrp_nested_latest.ls index d47e358..0c956e4 100644 --- a/tools/testfiles/h5mkgrp_nested_latest.ls +++ b/tools/testfiles/h5mkgrp_nested_latest.ls @@ -3,10 +3,10 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_latest.h5' ############################# Opened "../testfiles/h5mkgrp_nested_latest.h5" with sec2 driver. /one Group - Location: 1:612 + Location: 1:618 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /one/two Group - Location: 1:354 + Location: 1:360 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/testfiles/h5mkgrp_nested_mult_latest.ls b/tools/testfiles/h5mkgrp_nested_mult_latest.ls index 548cf21..6774ad9 100644 --- a/tools/testfiles/h5mkgrp_nested_mult_latest.ls +++ b/tools/testfiles/h5mkgrp_nested_mult_latest.ls @@ -3,18 +3,18 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult_latest.h5' ############################# Opened "../testfiles/h5mkgrp_nested_mult_latest.h5" with sec2 driver. /one Group - Location: 1:612 + Location: 1:618 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /one/two Group - Location: 1:354 + Location: 1:360 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /three Group - Location: 1:1128 + Location: 1:1134 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /three/four Group - Location: 1:870 + Location: 1:876 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/testfiles/h5mkgrp_several_latest.ls b/tools/testfiles/h5mkgrp_several_latest.ls index 894855d..e4f830f 100644 --- a/tools/testfiles/h5mkgrp_several_latest.ls +++ b/tools/testfiles/h5mkgrp_several_latest.ls @@ -3,10 +3,10 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_several_latest.h5' ############################# Opened "../testfiles/h5mkgrp_several_latest.h5" with sec2 driver. /one Group - Location: 1:354 + Location: 1:360 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /two Group - Location: 1:612 + Location: 1:618 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/testfiles/h5mkgrp_single_latest.ls b/tools/testfiles/h5mkgrp_single_latest.ls index d10628b..8c86394 100644 --- a/tools/testfiles/h5mkgrp_single_latest.ls +++ b/tools/testfiles/h5mkgrp_single_latest.ls @@ -3,6 +3,6 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_single_latest.h5' ############################# Opened "../testfiles/h5mkgrp_single_latest.h5" with sec2 driver. /latest Group - Location: 1:354 + Location: 1:360 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX |