1 files changed, 9 insertions, 12 deletions
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index 093fb04..64f0ccb 100755
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -213,6 +213,11 @@ typedef struct {
     hid_t dxpl_id;
 } H5SM_incr_ref_opdata;
 
+/* v2 B-tree client callback context */
+typedef struct H5SM_bt2_ctx_t {
+    uint8_t     sizeof_addr;    /* Size of file addresses */
+} H5SM_bt2_ctx_t;
+
 
 /****************************/
 /* Package Variables        */
@@ -236,20 +241,12 @@ H5_DLLVAR const H5B2_class_t H5SM_INDEX[1];
 H5_DLL ssize_t H5SM_get_index(const H5SM_master_table_t *table, unsigned type_id);
 
 /* Encode and decode routines, used for B-tree and cache encoding/decoding */
-H5_DLL herr_t H5SM_message_encode(const H5F_t *f, uint8_t *raw,
-    const void *native);
-H5_DLL herr_t H5SM_message_decode(const H5F_t *f, const uint8_t *raw,
-    void *native);
-
-/* Callbacks to give to B-tree traversals */
-/* H5SM_message_compare is in H5SMbtree2.c, but is also used by list code
- * in H5SM.c.
- */
-H5_DLL herr_t H5SM_message_compare(const void *rec1,
-                                   const void *rec2);
+H5_DLL herr_t H5SM_message_compare(const void *rec1, const void *rec2);
+H5_DLL herr_t H5SM_message_encode(uint8_t *raw, const void *native, void *ctx);
+H5_DLL herr_t H5SM_message_decode(const uint8_t *raw, void *native, void *ctx);
 
 /* H5B2_remove_t callback to add messages to a list index */
-H5_DLL herr_t H5SM_btree_convert_to_list_op(const void * record, void *op_data);
+H5_DLL herr_t H5SM_bt2_convert_to_list_op(const void * record, void *op_data);
 
 /* Fractal heap 'op' callback to compute hash value for message "in place" */
 H5_DLL herr_t H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata);