summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-09-16 20:01:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-09-16 20:01:08 (GMT)
commitf93f533fd5b1e1c998392d3c1ad95f65970ef5f3 (patch)
tree627c7fdc4e5525771dd4b1d40efc82104b1e583d /src
parentc561dc7183a5496efdbccd25a0fb2b31b6d9772d (diff)
downloadhdf5-f93f533fd5b1e1c998392d3c1ad95f65970ef5f3.zip
hdf5-f93f533fd5b1e1c998392d3c1ad95f65970ef5f3.tar.gz
hdf5-f93f533fd5b1e1c998392d3c1ad95f65970ef5f3.tar.bz2
[svn-r19402] Description:
Correct Bz#1968 (Problem when opening new format file with H5F_LIBVER_EARLIEST) by initializing symbol table leaf information in a more universal way. Also cleaned up other superblock initialization a little bit while I'm here. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production mode Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode Mac OS X/32 10.6.4 (amazon) in debug mode Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'src')
-rw-r--r--src/H5Fsuper_cache.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index 6305888..f9a29e8 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -448,6 +448,8 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata)
/* Get the B-tree internal node values, etc */
if(H5P_get(c_plist, H5F_CRT_BTREE_RANK_NAME, sblock->btree_k) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "unable to get rank for btree internal nodes")
+ if(H5P_get(c_plist, H5F_CRT_SYM_LEAF_NAME, &sblock->sym_leaf_k) < 0)
+ HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "unable to get rank for btree internal nodes")
} /* end else */
/*
@@ -560,12 +562,6 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata)
if(H5P_set(c_plist, H5F_CRT_SYM_LEAF_NAME, &btreek.sym_leaf_k) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, "unable to set rank for symbol table leaf nodes")
} /* end if */
- else {
- /* No non-default v1 B-tree 'K' value info in file, use defaults */
- sblock->btree_k[H5B_CHUNK_ID] = HDF5_BTREE_CHUNK_IK_DEF;
- sblock->btree_k[H5B_SNODE_ID] = HDF5_BTREE_SNODE_IK_DEF;
- sblock->sym_leaf_k = H5F_CRT_SYM_LEAF_DEF;
- } /* end if */
/* Check for the extension having a 'free-space manager info' message */
if((status = H5O_msg_exists(&ext_loc, H5O_FSINFO_ID, dxpl_id)) < 0)
@@ -597,10 +593,6 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata)
for(u = 1; u < NELMTS(f->shared->fs_addr); u++)
shared->fs_addr[u] = fsinfo.fs_addr[u-1];
} /* end if */
- else {
- for(u = 0; u < NELMTS(f->shared->fs_addr); u++)
- shared->fs_addr[u] = HADDR_UNDEF;
- } /* end else */
/* Close superblock extension */
if(H5F_super_ext_close(f, &ext_loc) < 0)