From 16b58c57d6d1e062134ea4bbfe9042b7651b6ce1 Mon Sep 17 00:00:00 2001 From: Richard Warren Date: Fri, 4 May 2018 08:05:53 -0400 Subject: Removed the two places where I previously overrode the default fill.alloc_time --- src/H5D.c | 7 ------- src/H5Pint.c | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/H5D.c b/src/H5D.c index 80e6198..1ad3fb3 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -144,10 +144,6 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, lcpl_id, dcpl_id, dapl_id, dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset") - if (H5F_HAS_FEATURE(loc.oloc->file, H5FD_FEAT_ALLOCATE_EARLY)) { - dset->shared->dcpl_cache.fill.alloc_time = H5D_ALLOC_TIME_EARLY; - } - if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset") @@ -298,9 +294,6 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id) if(NULL == (dset = H5D__open_name(&loc, name, dapl_id, dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset") - if(H5F_HAS_FEATURE(loc.oloc->file, H5FD_FEAT_ALLOCATE_EARLY)) - dset->shared->dcpl_cache.fill.alloc_time = H5D_ALLOC_TIME_EARLY; - /* Register an atom for the dataset */ if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0) HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "can't register dataset atom") diff --git a/src/H5Pint.c b/src/H5Pint.c index 1d52f69..66f3eb1 100644 --- a/src/H5Pint.c +++ b/src/H5Pint.c @@ -3419,9 +3419,8 @@ H5P_cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2) if(prop1->value != NULL && prop2->value == NULL) HGOTO_DONE(1); if(prop1->value != NULL) { /* Call comparison routine */ - if((cmp_value = prop1->cmp(prop1->value, prop2->value, prop1->size)) != 0) { + if((cmp_value = prop1->cmp(prop1->value, prop2->value, prop1->size)) != 0) HGOTO_DONE(cmp_value); - } } /* end if */ done: -- cgit v0.12