[svn-r17944] Description:

	Bring r17943 from trunk to 1.8 branch:

	Finish refactoring v2 B-trees so that they can have client callback
context provided to the encode/decode callbacks.

Tested on:
	FreeBSD/64 6.3 (liberty)
	(h5committested on trunk)

1 files changed, 22 insertions, 14 deletions

diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index 7d0bb4c..eb2c741 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -81,20 +81,20 @@ typedef struct H5A_fh_ud_cmp_t {
 /* v2 B-tree driver callbacks for 'creation order' index */
 static herr_t H5A_dense_btree2_corder_store(void *native, const void *udata);
 static herr_t H5A_dense_btree2_corder_compare(const void *rec1, const void *rec2);
-static herr_t H5A_dense_btree2_corder_encode(const H5F_t *f, uint8_t *raw,
-    const void *native);
-static herr_t H5A_dense_btree2_corder_decode(const H5F_t *f, const uint8_t *raw,
-    void *native);
+static herr_t H5A_dense_btree2_corder_encode(uint8_t *raw, const void *native,
+    void *ctx);
+static herr_t H5A_dense_btree2_corder_decode(const uint8_t *raw, void *native,
+    void *ctx);
 static herr_t H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
     int indent, int fwidth, const void *record, const void *_udata);
 
 /* v2 B-tree driver callbacks for 'name' index */
 static herr_t H5A_dense_btree2_name_store(void *native, const void *udata);
 static herr_t H5A_dense_btree2_name_compare(const void *rec1, const void *rec2);
-static herr_t H5A_dense_btree2_name_encode(const H5F_t *f, uint8_t *raw,
-    const void *native);
-static herr_t H5A_dense_btree2_name_decode(const H5F_t *f, const uint8_t *raw,
-    void *native);
+static herr_t H5A_dense_btree2_name_encode(uint8_t *raw, const void *native,
+    void *ctx);
+static herr_t H5A_dense_btree2_name_decode(const uint8_t *raw, void *native,
+    void *ctx);
 static herr_t H5A_dense_btree2_name_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
     int indent, int fwidth, const void *record, const void *_udata);
 
@@ -110,11 +110,15 @@ const H5B2_class_t H5A_BT2_NAME[1]={{  /* B-tree class information */
     H5B2_ATTR_DENSE_NAME_ID,           /* Type of B-tree */
     "H5B2_ATTR_DENSE_NAME_ID",         /* Name of B-tree class */
     sizeof(H5A_dense_bt2_name_rec_t),  /* Size of native record */
+    NULL,                              /* Create client callback context */
+    NULL,                              /* Destroy client callback context */
     H5A_dense_btree2_name_store,       /* Record storage callback */
     H5A_dense_btree2_name_compare,     /* Record comparison callback */
     H5A_dense_btree2_name_encode,      /* Record encoding callback */
     H5A_dense_btree2_name_decode,      /* Record decoding callback */
-    H5A_dense_btree2_name_debug        /* Record debugging callback */
+    H5A_dense_btree2_name_debug,       /* Record debugging callback */
+    NULL,                              /* Create debugging context */
+    NULL                               /* Destroy debugging context */
 }};
 
 /* v2 B-tree class for indexing 'creation order' field of attributes */
@@ -122,11 +126,15 @@ const H5B2_class_t H5A_BT2_CORDER[1]={{ /* B-tree class information */
     H5B2_ATTR_DENSE_CORDER_ID,         /* Type of B-tree */
     "H5B2_ATTR_DENSE_CORDER_ID",       /* Name of B-tree class */
     sizeof(H5A_dense_bt2_corder_rec_t),/* Size of native record */
+    NULL,                              /* Create client callback context */
+    NULL,                              /* Destroy client callback context */
     H5A_dense_btree2_corder_store,     /* Record storage callback */
     H5A_dense_btree2_corder_compare,   /* Record comparison callback */
     H5A_dense_btree2_corder_encode,    /* Record encoding callback */
     H5A_dense_btree2_corder_decode,    /* Record decoding callback */
-    H5A_dense_btree2_corder_debug      /* Record debugging callback */
+    H5A_dense_btree2_corder_debug,     /* Record debugging callback */
+    NULL,                              /* Create debugging context */
+    NULL                               /* Destroy debugging context */
 }};
 
 
@@ -311,7 +319,7 @@ H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5A_dense_btree2_name_encode(const H5F_t UNUSED *f, uint8_t *raw, const void *_nrecord)
+H5A_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void UNUSED *ctx)
 {
     const H5A_dense_bt2_name_rec_t *nrecord = (const H5A_dense_bt2_name_rec_t *)_nrecord;
 
@@ -341,7 +349,7 @@ H5A_dense_btree2_name_encode(const H5F_t UNUSED *f, uint8_t *raw, const void *_n
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5A_dense_btree2_name_decode(const H5F_t UNUSED *f, const uint8_t *raw, void *_nrecord)
+H5A_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void UNUSED *ctx)
 {
     H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord;
 
@@ -469,7 +477,7 @@ H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5A_dense_btree2_corder_encode(const H5F_t UNUSED *f, uint8_t *raw, const void *_nrecord)
+H5A_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void UNUSED *ctx)
 {
     const H5A_dense_bt2_corder_rec_t *nrecord = (const H5A_dense_bt2_corder_rec_t *)_nrecord;
 
@@ -498,7 +506,7 @@ H5A_dense_btree2_corder_encode(const H5F_t UNUSED *f, uint8_t *raw, const void *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5A_dense_btree2_corder_decode(const H5F_t UNUSED *f, const uint8_t *raw, void *_nrecord)
+H5A_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void UNUSED *ctx)
 {
     H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord;