summaryrefslogtreecommitdiffstats
path: root/src/H5Fsuper_cache.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-09-16 20:33:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-09-16 20:33:16 (GMT)
commit6cb4260eff978e7dcbbd8014f1188dfd02550779 (patch)
tree7779ebbd67fd58f5e1f13dc2e6e6ab1096c3b22d /src/H5Fsuper_cache.c
parent607c97c175fdfb14494fe804dd65066ded7f7a98 (diff)
downloadhdf5-6cb4260eff978e7dcbbd8014f1188dfd02550779.zip
hdf5-6cb4260eff978e7dcbbd8014f1188dfd02550779.tar.gz
hdf5-6cb4260eff978e7dcbbd8014f1188dfd02550779.tar.bz2
[svn-r19405] Description:
Bring r19402 from trunk to 1.8 branch: 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 Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production 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/H5Fsuper_cache.c')
-rw-r--r--src/H5Fsuper_cache.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index bffb5e0..492b29a 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -447,6 +447,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 */
/*
@@ -558,12 +560,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 */
/* Close superblock extension */
if(H5F_super_ext_close(f, &ext_loc) < 0)