diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-11-27 19:44:12 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-11-27 19:44:12 (GMT) |
| commit | 2dad38a26cfcc36ce3fbc399cbc7f446fb08afcd (patch) | |
| tree | 76d834bb22214f3bd771ad993c09273391370808 | |
| parent | 77e6a52f9a5b80e125b603d5752e3eb86568726f (diff) | |
| download | hdf5-2dad38a26cfcc36ce3fbc399cbc7f446fb08afcd.zip hdf5-2dad38a26cfcc36ce3fbc399cbc7f446fb08afcd.tar.gz hdf5-2dad38a26cfcc36ce3fbc399cbc7f446fb08afcd.tar.bz2 | |
[svn-r4656] Purpose:
Bug fix
Description:
Moved some executable code out of an assert() and check the results of the
code with an assert().
Platforms tested:
Solaris 2.6 (baldric)
| -rw-r--r-- | src/H5Distore.c | 6 | ||||
| -rw-r--r-- | src/H5Fistore.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c index d016961..ae7977f 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -1506,7 +1506,8 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id)); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); - assert((plist=H5I_object(dxpl_id))!=NULL); + plist=H5I_object(dxpl_id); + assert(plist!=NULL); H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(ent->split_ratios)); /* Add it to the cache */ @@ -1653,7 +1654,8 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id)); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); - assert((plist=H5I_object(dxpl_id))!=NULL); + plist=H5I_object(dxpl_id); + assert(plist!=NULL); H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(x.split_ratios)); H5F_istore_flush_entry (f, &x, TRUE); diff --git a/src/H5Fistore.c b/src/H5Fistore.c index d016961..ae7977f 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -1506,7 +1506,8 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id)); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); - assert((plist=H5I_object(dxpl_id))!=NULL); + plist=H5I_object(dxpl_id); + assert(plist!=NULL); H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(ent->split_ratios)); /* Add it to the cache */ @@ -1653,7 +1654,8 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id)); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); - assert((plist=H5I_object(dxpl_id))!=NULL); + plist=H5I_object(dxpl_id); + assert(plist!=NULL); H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(x.split_ratios)); H5F_istore_flush_entry (f, &x, TRUE); |