[svn-r12589] Description:

    Revert passing the v2 B-tree class to callbacks, it turns out to be
unnecessary.  Also revert have a "class private" pointer for each v2 B-tree
class.

    Add in support for the different flavors of fractal heap 'huge' objects
also.

Tested on:
    FreeBSD/32 4.11 (sleipnir)
    Linux/64 2.4 (mir)
    Solaris/64 2.9 (shanti)

1 files changed, 12 insertions, 13 deletions

diff --git a/src/H5B2test.c b/src/H5B2test.c
index 68f26ee..1844e75 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -51,15 +51,15 @@
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5B2_test_store(const H5B2_class_t *cls, void *nrecord, const void *udata);
-static herr_t H5B2_test_retrieve(const H5B2_class_t *cls, void *udata, const void *nrecord);
-static herr_t H5B2_test_compare(const H5B2_class_t *cls, const void *rec1, const void *rec2);
-static herr_t H5B2_test_encode(const H5F_t *f, const H5B2_class_t *cls, uint8_t *raw,
+static herr_t H5B2_test_store(void *nrecord, const void *udata);
+static herr_t H5B2_test_retrieve(void *udata, const void *nrecord);
+static herr_t H5B2_test_compare(const void *rec1, const void *rec2);
+static herr_t H5B2_test_encode(const H5F_t *f, uint8_t *raw,
     const void *nrecord);
-static herr_t H5B2_test_decode(const H5F_t *f, const H5B2_class_t *cls, const uint8_t *raw,
+static herr_t H5B2_test_decode(const H5F_t *f, const uint8_t *raw,
     void *nrecord);
 static herr_t H5B2_test_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const H5B2_class_t *cls, const void *record, const void *_udata);
+    int indent, int fwidth, const void *record, const void *_udata);
 
 /*********************/
 /* Package Variables */
@@ -67,7 +67,6 @@ static herr_t H5B2_test_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
 const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
     H5B2_TEST_ID,               /* Type of B-tree */
     sizeof(hsize_t),            /* Size of native record */
-    NULL,                       /* Class private information */
     H5B2_test_store,            /* Record storage callback */
     H5B2_test_retrieve,         /* Record retrieval callback */
     H5B2_test_compare,          /* Record comparison callback */
@@ -101,7 +100,7 @@ const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_test_store(const H5B2_class_t UNUSED *cls, void *nrecord, const void *udata)
+H5B2_test_store(void *nrecord, const void *udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_store)
 
@@ -126,7 +125,7 @@ H5B2_test_store(const H5B2_class_t UNUSED *cls, void *nrecord, const void *udata
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_test_retrieve(const H5B2_class_t UNUSED *cls, void *udata, const void *nrecord)
+H5B2_test_retrieve(void *udata, const void *nrecord)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_retrieve)
 
@@ -151,7 +150,7 @@ H5B2_test_retrieve(const H5B2_class_t UNUSED *cls, void *udata, const void *nrec
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_test_compare(const H5B2_class_t UNUSED *cls, const void *rec1, const void *rec2)
+H5B2_test_compare(const void *rec1, const void *rec2)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_compare)
 
@@ -174,7 +173,7 @@ H5B2_test_compare(const H5B2_class_t UNUSED *cls, const void *rec1, const void *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_test_encode(const H5F_t *f, const H5B2_class_t UNUSED *cls, uint8_t *raw, const void *nrecord)
+H5B2_test_encode(const H5F_t *f, uint8_t *raw, const void *nrecord)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_encode)
 
@@ -199,7 +198,7 @@ H5B2_test_encode(const H5F_t *f, const H5B2_class_t UNUSED *cls, uint8_t *raw, c
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_test_decode(const H5F_t *f, const H5B2_class_t UNUSED *cls, const uint8_t *raw, void *nrecord)
+H5B2_test_decode(const H5F_t *f, const uint8_t *raw, void *nrecord)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_decode)
 
@@ -225,7 +224,7 @@ H5B2_test_decode(const H5F_t *f, const H5B2_class_t UNUSED *cls, const uint8_t *
  */
 static herr_t
 H5B2_test_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_id,
-    int indent, int fwidth, const H5B2_class_t UNUSED *cls, const void *record,
+    int indent, int fwidth, const void *record,
     const void UNUSED *_udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_debug)