diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 18:33:36 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 18:33:36 (GMT) |
| commit | e4ee157c86ea837ba8297c50cefdc296e8401094 (patch) | |
| tree | 834205bf56ec642aab0f022382fab69bb7c64c46 /src/H5B2.c | |
| parent | 53d5ccb17e75f4ce182f3d98f2b60891de07e716 (diff) | |
| download | hdf5-e4ee157c86ea837ba8297c50cefdc296e8401094.zip hdf5-e4ee157c86ea837ba8297c50cefdc296e8401094.tar.gz hdf5-e4ee157c86ea837ba8297c50cefdc296e8401094.tar.bz2 | |
[svn-r18635] Description:
Bring r18634 from trunk to 1.8 branch:
Clean up compiler warnings.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5B2.c')
| -rw-r--r-- | src/H5B2.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -743,7 +743,8 @@ H5B2_remove(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op, if(H5FL_fac_term(hdr->node_info[hdr->depth].node_ptr_fac) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy node's node pointer block factory") - hdr->depth -= (uint16_t)depth_decreased; + HDassert((uint16_t)(hdr->depth - depth_decreased) < hdr->depth); + hdr->depth = (uint16_t)(hdr->depth - depth_decreased); } /* end for */ } /* end if */ else { @@ -824,7 +825,8 @@ H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, if(H5FL_fac_term(hdr->node_info[hdr->depth].node_ptr_fac) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy node's node pointer block factory") - hdr->depth -= (uint16_t)depth_decreased; + HDassert((uint16_t)(hdr->depth - depth_decreased) < hdr->depth); + hdr->depth = (uint16_t)(hdr->depth - depth_decreased); } /* end for */ } /* end if */ else { |