[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

1 files changed, 0 insertions, 30 deletions

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.