summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-12-15 17:39:20 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-12-15 17:39:20 (GMT)
commit379b5a7b01a2ba97e754b0d85da8ae014b715c42 (patch)
tree98771de2e0f20703a2bfeb90ebfcec8c9a82236d /src
parent8b971620b4a8d65cbdd6d9703f999b12f4c92698 (diff)
downloadhdf5-379b5a7b01a2ba97e754b0d85da8ae014b715c42.zip
hdf5-379b5a7b01a2ba97e754b0d85da8ae014b715c42.tar.gz
hdf5-379b5a7b01a2ba97e754b0d85da8ae014b715c42.tar.bz2
[svn-r16194] 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')
-rw-r--r--src/H5B2int.c30
1 files changed, 4 insertions, 26 deletions
diff --git a/src/H5B2int.c b/src/H5B2int.c
index a6d53a5..aa1fdca 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -3214,12 +3214,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() */
@@ -3244,14 +3239,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() */
@@ -3277,12 +3265,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;
@@ -3323,12 +3306,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;