diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-12-15 17:40:53 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-12-15 17:40:53 (GMT) |
| commit | cdd8891bc15bef7c52aff39e707f09804b6551db (patch) | |
| tree | efa6845b7776497e53d019d75ee7dd693edcfc4d | |
| parent | a5a121cd0a7939011a8d1172a30da22d760feb4b (diff) | |
| download | hdf5-cdd8891bc15bef7c52aff39e707f09804b6551db.zip hdf5-cdd8891bc15bef7c52aff39e707f09804b6551db.tar.gz hdf5-cdd8891bc15bef7c52aff39e707f09804b6551db.tar.bz2 | |
[svn-r28666] Minor trunk->revise_chunks normalization.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
serial only
| -rw-r--r-- | src/H5B.c | 1 | ||||
| -rw-r--r-- | src/H5Fint.c | 10 | ||||
| -rw-r--r-- | src/H5Gtest.c | 2 |
3 files changed, 6 insertions, 7 deletions
@@ -1274,6 +1274,7 @@ H5B__remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *typ FUNC_ENTER_STATIC HDassert(f); + HDassert(H5F_addr_defined(addr)); HDassert(type); HDassert(type->decode); HDassert(type->cmp3); diff --git a/src/H5Fint.c b/src/H5Fint.c index cc693ca..e163103 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -633,19 +633,17 @@ H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get sieve buffer size") if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &(f->shared->latest_format)) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get 'latest format' flag") - + /* Require the latest format to use SWMR */ + /* (Need to revisit this when the 1.10 release is made, and require + * 1.10 or later -QAK) + */ /* For latest format or SWMR_WRITE, activate all latest version support */ if((f->shared->latest_format) || (H5F_INTENT(f) & H5F_ACC_SWMR_WRITE)) f->shared->latest_flags |= H5F_LATEST_ALL_FLAGS; - if(H5P_get(plist, H5F_ACS_USE_MDC_LOGGING_NAME, &(f->shared->use_mdc_logging)) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get 'use mdc logging' flag") if(H5P_get(plist, H5F_ACS_START_MDC_LOG_ON_ACCESS_NAME, &(f->shared->start_mdc_log_on_access)) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get 'start mdc log on access' flag") - /* Require the latest format to use SWMR */ - /* (Need to revisit this when the 1.10 release is made, and require - * 1.10 or later -QAK) - */ if(H5P_get(plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(f->shared->meta_aggr.alloc_size)) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get metadata cache size") f->shared->meta_aggr.feature_flag = H5FD_FEAT_AGGREGATE_METADATA; diff --git a/src/H5Gtest.c b/src/H5Gtest.c index 04607ef..f7ca0f1 100644 --- a/src/H5Gtest.c +++ b/src/H5Gtest.c @@ -633,7 +633,7 @@ H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent) HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "cached stab info does not match object header") /* Verify that the btree address is valid */ - if(H5B_valid(grp_oloc->file, H5AC_ind_dxpl_id, H5B_SNODE, stab.btree_addr) < 0) + if(H5B_valid(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr) < 0) HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "b-tree address is invalid") /* Verify that the heap address is valid */ |