[svn-r17429] Description:

	Bring work from "compress group's fractal heap" branch back to trunk:
reove unnecessary v2 B-tree 'retrieve' callback from v2 B-tree clients.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.8 (amazon) in debug mode
        Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

6 files changed, 1 insertions, 266 deletions

diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index da4ad86..a0035b3 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -80,7 +80,6 @@ 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_retrieve(void *udata, const void *native);
 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);
@@ -112,7 +111,6 @@ const H5B2_class_t H5A_BT2_NAME[1]={{  /* B-tree class information */
     H5B2_ATTR_DENSE_NAME_ID,                /* Type of B-tree */
     sizeof(H5A_dense_bt2_name_rec_t),  /* Size of native record */
     H5A_dense_btree2_name_store,       /* Record storage callback */
-    H5A_dense_btree2_name_retrieve,    /* Record retrieval 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 */
@@ -124,7 +122,6 @@ const H5B2_class_t H5A_BT2_CORDER[1]={{  /* B-tree class information */
     H5B2_ATTR_DENSE_CORDER_ID,                /* Type of B-tree */
     sizeof(H5A_dense_bt2_corder_rec_t),/* Size of native record */
     H5A_dense_btree2_corder_store,     /* Record storage callback */
-    H5A_dense_btree2_corder_retrieve,  /* Record retrieval 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 */
@@ -229,30 +226,6 @@ H5A_dense_btree2_name_store(void *_nrecord, const void *_udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A_dense_btree2_name_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, December  4, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5A_dense_btree2_name_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_retrieve)
-
-    *(H5A_dense_bt2_name_rec_t *)udata = *(const H5A_dense_bt2_name_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5A_dense_btree2_name_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_compare
  *
  * Purpose:	Compare two native information records, according to some key
@@ -443,30 +416,6 @@ H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A_dense_btree2_corder_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, February  6, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5A_dense_btree2_corder_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_retrieve)
-
-    *(H5A_dense_bt2_corder_rec_t *)udata = *(const H5A_dense_bt2_corder_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5A_dense_btree2_corder_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_compare
  *
  * Purpose:	Compare two native information records, according to some key
diff --git a/src/H5B2private.h b/src/H5B2private.h
index 0a18604..0a516d2 100644
--- a/src/H5B2private.h
+++ b/src/H5B2private.h
@@ -84,9 +84,8 @@ struct H5B2_class_t {
     H5B2_subid_t id;		/* ID of B-tree class, as found in file */
     size_t nrec_size;           /* Size of native (memory) record */
 
-    /* Store & retrieve record from application to B-tree 'native' form */
+    /* Store record from application to B-tree 'native' form */
     herr_t (*store)(void *nrecord, const void *udata);                  /*  Store record in native record table */
-    herr_t (*retrieve)(void *udata, const void *nrecord);               /*  Retrieve record in native record table */
 
     /* Compare records, according to a key */
     herr_t (*compare)(const void *rec1, const void *rec2);              /*  Compare two native records */
diff --git a/src/H5B2test.c b/src/H5B2test.c
index 46cd510..3fa5d27 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -53,7 +53,6 @@
 /* Local Prototypes */
 /********************/
 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);
@@ -69,7 +68,6 @@ 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 */
     H5B2_test_store,            /* Record storage callback */
-    H5B2_test_retrieve,         /* Record retrieval callback */
     H5B2_test_compare,          /* Record comparison callback */
     H5B2_test_encode,           /* Record encoding callback */
     H5B2_test_decode,           /* Record decoding callback */
@@ -112,31 +110,6 @@ H5B2_test_store(void *nrecord, const void *udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5B2_test_retrieve
- *
- * Purpose:	Retrieve native information from record for B-tree
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Friday, February 25, 2005
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5B2_test_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_retrieve)
-
-    *(hsize_t *)udata = *(const hsize_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5B2_test_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5B2_test_compare
  *
  * Purpose:	Compare two native information records, according to some key
diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c
index 9afd882..5f7ad23 100644
--- a/src/H5Gbtree2.c
+++ b/src/H5Gbtree2.c
@@ -78,7 +78,6 @@ typedef struct H5G_fh_ud_cmp_t {
 
 /* v2 B-tree driver callbacks for 'creation order' index */
 static herr_t H5G_dense_btree2_corder_store(void *native, const void *udata);
-static herr_t H5G_dense_btree2_corder_retrieve(void *udata, const void *native);
 static herr_t H5G_dense_btree2_corder_compare(const void *rec1, const void *rec2);
 static herr_t H5G_dense_btree2_corder_encode(const H5F_t *f, uint8_t *raw,
     const void *native);
@@ -89,7 +88,6 @@ static herr_t H5G_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t
 
 /* v2 B-tree driver callbacks for 'name' index */
 static herr_t H5G_dense_btree2_name_store(void *native, const void *udata);
-static herr_t H5G_dense_btree2_name_retrieve(void *udata, const void *native);
 static herr_t H5G_dense_btree2_name_compare(const void *rec1, const void *rec2);
 static herr_t H5G_dense_btree2_name_encode(const H5F_t *f, uint8_t *raw,
     const void *native);
@@ -110,7 +108,6 @@ const H5B2_class_t H5G_BT2_NAME[1]={{     /* B-tree class information */
     H5B2_GRP_DENSE_NAME_ID,             /* Type of B-tree */
     sizeof(H5G_dense_bt2_name_rec_t),   /* Size of native record */
     H5G_dense_btree2_name_store,        /* Record storage callback */
-    H5G_dense_btree2_name_retrieve,     /* Record retrieval callback */
     H5G_dense_btree2_name_compare,      /* Record comparison callback */
     H5G_dense_btree2_name_encode,       /* Record encoding callback */
     H5G_dense_btree2_name_decode,       /* Record decoding callback */
@@ -122,7 +119,6 @@ const H5B2_class_t H5G_BT2_CORDER[1]={{ /* B-tree class information */
     H5B2_GRP_DENSE_CORDER_ID,           /* Type of B-tree */
     sizeof(H5G_dense_bt2_corder_rec_t), /* Size of native record */
     H5G_dense_btree2_corder_store,      /* Record storage callback */
-    H5G_dense_btree2_corder_retrieve,   /* Record retrieval callback */
     H5G_dense_btree2_corder_compare,    /* Record comparison callback */
     H5G_dense_btree2_corder_encode,     /* Record encoding callback */
     H5G_dense_btree2_corder_decode,     /* Record decoding callback */
@@ -214,30 +210,6 @@ H5G_dense_btree2_name_store(void *_nrecord, const void *_udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_dense_btree2_name_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, September 11, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_dense_btree2_name_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_retrieve)
-
-    *(H5G_dense_bt2_name_rec_t *)udata = *(const H5G_dense_bt2_name_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5G_dense_btree2_name_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_name_compare
  *
  * Purpose:	Compare two native information records, according to some key
@@ -428,30 +400,6 @@ H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_dense_btree2_corder_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, October 30, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_dense_btree2_corder_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_retrieve)
-
-    *(H5G_dense_bt2_corder_rec_t *)udata = *(const H5G_dense_bt2_corder_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5G_dense_btree2_corder_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5G_dense_btree2_corder_compare
  *
  * Purpose:	Compare two native information records, according to some key
diff --git a/src/H5HFbtree2.c b/src/H5HFbtree2.c
index b750822..5958c03 100644
--- a/src/H5HFbtree2.c
+++ b/src/H5HFbtree2.c
@@ -61,7 +61,6 @@
 
 /* v2 B-tree driver callbacks */
 static herr_t H5HF_huge_btree2_indir_store(void *native, const void *udata);
-static herr_t H5HF_huge_btree2_indir_retrieve(void *udata, const void *native);
 static herr_t H5HF_huge_btree2_indir_compare(const void *rec1, const void *rec2);
 static herr_t H5HF_huge_btree2_indir_encode(const H5F_t *f, uint8_t *raw,
     const void *native);
@@ -71,7 +70,6 @@ static herr_t H5HF_huge_btree2_indir_debug(FILE *stream, const H5F_t *f, hid_t d
     int indent, int fwidth, const void *record, const void *_udata);
 
 static herr_t H5HF_huge_btree2_filt_indir_store(void *native, const void *udata);
-static herr_t H5HF_huge_btree2_filt_indir_retrieve(void *udata, const void *native);
 static herr_t H5HF_huge_btree2_filt_indir_compare(const void *rec1, const void *rec2);
 static herr_t H5HF_huge_btree2_filt_indir_encode(const H5F_t *f, uint8_t *raw,
     const void *native);
@@ -81,7 +79,6 @@ static herr_t H5HF_huge_btree2_filt_indir_debug(FILE *stream, const H5F_t *f, hi
     int indent, int fwidth, const void *record, const void *_udata);
 
 static herr_t H5HF_huge_btree2_dir_store(void *native, const void *udata);
-static herr_t H5HF_huge_btree2_dir_retrieve(void *udata, const void *native);
 static herr_t H5HF_huge_btree2_dir_compare(const void *rec1, const void *rec2);
 static herr_t H5HF_huge_btree2_dir_encode(const H5F_t *f, uint8_t *raw,
     const void *native);
@@ -91,7 +88,6 @@ static herr_t H5HF_huge_btree2_dir_debug(FILE *stream, const H5F_t *f, hid_t dxp
     int indent, int fwidth, const void *record, const void *_udata);
 
 static herr_t H5HF_huge_btree2_filt_dir_store(void *native, const void *udata);
-static herr_t H5HF_huge_btree2_filt_dir_retrieve(void *udata, const void *native);
 static herr_t H5HF_huge_btree2_filt_dir_compare(const void *rec1, const void *rec2);
 static herr_t H5HF_huge_btree2_filt_dir_encode(const H5F_t *f, uint8_t *raw,
     const void *native);
@@ -108,7 +104,6 @@ const H5B2_class_t H5HF_BT2_INDIR[1]={{     /* B-tree class information */
     H5B2_FHEAP_HUGE_INDIR_ID,           /* Type of B-tree */
     sizeof(H5HF_huge_bt2_indir_rec_t),  /* Size of native record */
     H5HF_huge_btree2_indir_store,       /* Record storage callback */
-    H5HF_huge_btree2_indir_retrieve,    /* Record retrieval callback */
     H5HF_huge_btree2_indir_compare,     /* Record comparison callback */
     H5HF_huge_btree2_indir_encode,      /* Record encoding callback */
     H5HF_huge_btree2_indir_decode,      /* Record decoding callback */
@@ -120,7 +115,6 @@ const H5B2_class_t H5HF_BT2_FILT_INDIR[1]={{     /* B-tree class information */
     H5B2_FHEAP_HUGE_FILT_INDIR_ID,              /* Type of B-tree */
     sizeof(H5HF_huge_bt2_filt_indir_rec_t),     /* Size of native record */
     H5HF_huge_btree2_filt_indir_store,          /* Record storage callback */
-    H5HF_huge_btree2_filt_indir_retrieve,       /* Record retrieval callback */
     H5HF_huge_btree2_filt_indir_compare,        /* Record comparison callback */
     H5HF_huge_btree2_filt_indir_encode,         /* Record encoding callback */
     H5HF_huge_btree2_filt_indir_decode,         /* Record decoding callback */
@@ -132,7 +126,6 @@ const H5B2_class_t H5HF_BT2_DIR[1]={{     /* B-tree class information */
     H5B2_FHEAP_HUGE_DIR_ID,             /* Type of B-tree */
     sizeof(H5HF_huge_bt2_dir_rec_t),    /* Size of native record */
     H5HF_huge_btree2_dir_store,         /* Record storage callback */
-    H5HF_huge_btree2_dir_retrieve,      /* Record retrieval callback */
     H5HF_huge_btree2_dir_compare,       /* Record comparison callback */
     H5HF_huge_btree2_dir_encode,        /* Record encoding callback */
     H5HF_huge_btree2_dir_decode,        /* Record decoding callback */
@@ -144,7 +137,6 @@ const H5B2_class_t H5HF_BT2_FILT_DIR[1]={{     /* B-tree class information */
     H5B2_FHEAP_HUGE_FILT_DIR_ID,        /* Type of B-tree */
     sizeof(H5HF_huge_bt2_filt_dir_rec_t),/* Size of native record */
     H5HF_huge_btree2_filt_dir_store,    /* Record storage callback */
-    H5HF_huge_btree2_filt_dir_retrieve, /* Record retrieval callback */
     H5HF_huge_btree2_filt_dir_compare,  /* Record comparison callback */
     H5HF_huge_btree2_filt_dir_encode,   /* Record encoding callback */
     H5HF_huge_btree2_filt_dir_decode,   /* Record decoding callback */
@@ -251,30 +243,6 @@ H5HF_huge_btree2_indir_store(void *nrecord, const void *udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5HF_huge_btree2_indir_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, August  7, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5HF_huge_btree2_indir_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_btree2_indir_retrieve)
-
-    *(H5HF_huge_bt2_indir_rec_t *)udata = *(const H5HF_huge_bt2_indir_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5HF_huge_btree2_indir_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5HF_huge_btree2_indir_compare
  *
  * Purpose:	Compare two native information records, according to some key
@@ -485,30 +453,6 @@ H5HF_huge_btree2_filt_indir_store(void *nrecord, const void *udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5HF_huge_btree2_filt_indir_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, August  7, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5HF_huge_btree2_filt_indir_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_btree2_filt_indir_retrieve)
-
-    *(H5HF_huge_bt2_filt_indir_rec_t *)udata = *(const H5HF_huge_bt2_filt_indir_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5HF_huge_btree2_filt_indir_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5HF_huge_btree2_filt_indir_compare
  *
  * Purpose:	Compare two native information records, according to some key
@@ -690,30 +634,6 @@ H5HF_huge_btree2_dir_store(void *nrecord, const void *udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5HF_huge_btree2_dir_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, August  7, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5HF_huge_btree2_dir_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_btree2_dir_retrieve)
-
-    *(H5HF_huge_bt2_dir_rec_t *)udata = *(const H5HF_huge_bt2_dir_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5HF_huge_btree2_dir_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5HF_huge_btree2_dir_compare
  *
  * Purpose:	Compare two native information records, according to some key
@@ -931,30 +851,6 @@ H5HF_huge_btree2_filt_dir_store(void *nrecord, const void *udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5HF_huge_btree2_filt_dir_retrieve
- *
- * Purpose:	Retrieve native information from record for v2 B-tree
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, August 15, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5HF_huge_btree2_filt_dir_retrieve(void *udata, const void *nrecord)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_btree2_filt_dir_retrieve)
-
-    *(H5HF_huge_bt2_filt_dir_rec_t *)udata = *(const H5HF_huge_bt2_filt_dir_rec_t *)nrecord;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5HF_huge_btree2_filt_dir_retrieve() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5HF_huge_btree2_filt_dir_compare
  *
  * Purpose:	Compare two native information records, according to some key
diff --git a/src/H5SMbtree2.c b/src/H5SMbtree2.c
index 8863287..3ddd3f2 100755
--- a/src/H5SMbtree2.c
+++ b/src/H5SMbtree2.c
@@ -53,7 +53,6 @@ typedef struct H5SM_compare_udata_t {
 /* v2 B-tree callbacks */
 static herr_t H5SM_btree_compare_cb(const void *obj, size_t obj_len, void *_udata);
 static herr_t H5SM_btree_store(void *native, const void *udata);
-static herr_t H5SM_btree_retrieve(void *udata, const void *native);
 static herr_t H5SM_btree_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
     int indent, int fwidth, const void *record, const void *_udata);
 
@@ -66,7 +65,6 @@ const H5B2_class_t H5SM_INDEX[1]={{   /* B-tree class information */
     H5B2_SOHM_INDEX_ID,               /* Type of B-tree */
     sizeof(H5SM_sohm_t),              /* Size of native record */
     H5SM_btree_store,                 /* Record storage callback */
-    H5SM_btree_retrieve,              /* Record retrieval callback */
     H5SM_message_compare,             /* Record comparison callback */
     H5SM_message_encode,              /* Record encoding callback */
     H5SM_message_decode,              /* Record decoding callback */
@@ -309,34 +307,6 @@ H5SM_btree_store(void *native, const void *udata)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5SM_btree_retrieve
- *
- * Purpose:	Retrieve a H5SM_sohm_t SOHM message from the B-tree by
- *              copying it from NATIVE to UDATA.
- *
- *              Quincey said this function may no longer be used.
- *
- * Return:	Non-negative on success
- *              Negative on failure
- *
- * Programmer:	James Laird
- *              Monday, November 6, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5SM_btree_retrieve(void *udata, const void *native)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_btree_retrieve)
-
-    /* Copy the B-tree's native message to the udata buffer */
-    *(H5SM_sohm_t *)udata = *(const H5SM_sohm_t *)native;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5SM_btree_retrieve */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5SM_btree_debug
  *
  * Purpose:	Print debugging information for a H5SM_sohm_t.