diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-12-15 17:43:11 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-12-15 17:43:11 (GMT) |
commit | 327484d5031e566b9c4c12a26e6d5576b32262d6 (patch) | |
tree | 2cf18d9c90c54e15b1462ff62dc3cfd926877936 /src/H5B2int.c | |
parent | 0c86f4cd9ca6df258220a8a4849c40b499904f6f (diff) | |
download | hdf5-327484d5031e566b9c4c12a26e6d5576b32262d6.zip hdf5-327484d5031e566b9c4c12a26e6d5576b32262d6.tar.gz hdf5-327484d5031e566b9c4c12a26e6d5576b32262d6.tar.bz2 |
[svn-r16195] Purpose:
Bug Fix
Description:
Resolved issues with broken sanity checks that were failing when the 'b2'
debugging package was enabled (v2 b-tree debugging):
- Fixed outdated assertions that would not compile. They now compile
and function correctly.
- Removed too far outdated assertions that would require too much
unnecessary refactoring of code in order to satisfy their
initial purpose.
- Re-enabled b2 debugging package when "--enable-debug=all" is
specified on the configure line.
Tested:
jam, smirom, linew
Diffstat (limited to 'src/H5B2int.c')
-rw-r--r-- | src/H5B2int.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/src/H5B2int.c b/src/H5B2int.c index 82185c0..8ce964c 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -3204,12 +3204,7 @@ H5B2_assert_leaf(H5B2_shared_t *shared, H5B2_leaf_t *leaf) unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(leaf->nrec<=shared->split_leaf_nrec); - - /* Sanity checking on records */ - for(u=0; u<leaf->nrec; u++) - for(v=0; v<u; v++) - HDassert((shared->type->compare)(H5B2_LEAF_NREC(leaf,shared,u), H5B2_LEAF_NREC(leaf,shared,v))>0); + HDassert(leaf->nrec<=shared->node_info->split_nrec); return(0); } /* end H5B2_assert_leaf() */ @@ -3234,14 +3229,7 @@ H5B2_assert_leaf2(H5B2_shared_t *shared, H5B2_leaf_t *leaf, H5B2_leaf_t *leaf2) unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(leaf->nrec<=shared->split_leaf_nrec); - - /* Sanity checking on records */ - for(u=0; u<leaf->nrec; u++) { - HDassert((shared->type->compare)(H5B2_LEAF_NREC(leaf2,shared,0), H5B2_LEAF_NREC(leaf,shared,u))>0); - for(v=0; v<u; v++) - HDassert((shared->type->compare)(H5B2_LEAF_NREC(leaf,shared,u), H5B2_LEAF_NREC(leaf,shared,v))>0); - } /* end for */ + HDassert(leaf->nrec<=shared->node_info->split_nrec); return(0); } /* end H5B2_assert_leaf() */ @@ -3267,12 +3255,7 @@ H5B2_assert_internal(hsize_t parent_all_nrec, H5B2_shared_t *shared, H5B2_intern unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(internal->nrec<=shared->split_int_nrec); - - /* Sanity checking on records */ - for(u=0; u<internal->nrec; u++) - for(v=0; v<u; v++) - HDassert((shared->type->compare)(H5B2_INT_NREC(internal,shared,u), H5B2_INT_NREC(internal,shared,v))>0); + HDassert(internal->nrec<=shared->node_info->split_nrec); /* Sanity checking on node pointers */ tot_all_nrec=internal->nrec; @@ -3313,12 +3296,7 @@ H5B2_assert_internal2(hsize_t parent_all_nrec, H5B2_shared_t *shared, H5B2_inter unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(internal->nrec<=shared->split_int_nrec); - - /* Sanity checking on records */ - for(u=0; u<internal->nrec; u++) - for(v=0; v<u; v++) - HDassert((shared->type->compare)(H5B2_INT_NREC(internal,shared,u), H5B2_INT_NREC(internal,shared,v))>0); + HDassert(internal->nrec<=shared->node_info->split_nrec); /* Sanity checking on node pointers */ tot_all_nrec=internal->nrec; |