[svn-r23366] Removed the H5Pset_dxpl_multi and H5Pget_dxpl_multi functions from the

library.  The intended functionality for them was never fully implemented
and they are fundamentally broken.

The functions were removed from the C and C++ interfaces.  They were not
exported in the Fortran interface.

Tested on: jam(c++/fortran/hl)

I tested using check-vfd to ensure the multi VFD still works properly.
There is no reason to test this on other machines or on parallel.

3 files changed, 0 insertions, 184 deletions

diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp
index 0785735..bc3e0af 100644
--- a/c++/src/H5DxferProp.cpp
+++ b/c++/src/H5DxferProp.cpp
@@ -266,43 +266,6 @@ void DSetMemXferPropList::getVlenMemManager( H5MM_allocate_t& alloc_func, void**
 }
 
 //--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::setMulti
-///\brief	Sets the data transfer property list for the multi-file driver.
-///\param	memb_dxpl - OUT: Array of data access property lists
-///\exception	H5::PropListIException
-///\par Description
-///		This function can only be used after the member map has
-///		been set with FileAccPropList::setMulti (not done - BMR.)
-// Programmer:	Binh-Minh Ribler - April, 2004
-//--------------------------------------------------------------------------
-void DSetMemXferPropList::setMulti(const hid_t *memb_dxpl)
-{
-   herr_t ret_value = H5Pset_dxpl_multi(id, memb_dxpl);
-   if (ret_value < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::setMulti",
-		"H5Pset_dxpl_multi failed");
-   }
-}
-
-//--------------------------------------------------------------------------
-// Function:	DSetMemXferPropList::getMulti
-///\brief	Returns multi-file data transfer property list information.
-///\param	memb_dxpl - OUT: Array of data access property lists
-///\exception	H5::PropListIException
-// Programmer:	Binh-Minh Ribler - April, 2004
-//--------------------------------------------------------------------------
-void DSetMemXferPropList::getMulti(hid_t *memb_dxpl)
-{
-   herr_t ret_value = H5Pget_dxpl_multi(id, memb_dxpl);
-   if (ret_value < 0)
-   {
-      throw PropListIException("DSetMemXferPropList::getMulti",
-		"H5Pget_dxpl_multi failed");
-   }
-}
-
-//--------------------------------------------------------------------------
 // Function:	DSetMemXferPropList::setSmallDataBlockSize
 ///\brief	Sets the size of a contiguous block reserved for small data.
 ///\param	size - IN: Maximum size, in bytes, of the small data block.
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 5bdfbbe..9d6e065 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -726,150 +726,6 @@ H5FD_multi_dxpl_cls_cb(const char *name, size_t size, void *_dx)
     return 0;
 } /* end H5FD_multi_dxpl_cls_cb() */
 
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_dxpl_multi
- *
- * Purpose:	Set the data transfer property list DXPL_ID to use the multi
- *		driver with the specified data transfer properties for each
- *		memory usage type MEMB_DXPL[] (after the usage map is
- *		applied).
- *
- * Return:	Success:	0
- *
- *		Failure:	-1
- *
- * Programmer:	Robb Matzke
- *              Tuesday, August 10, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_dxpl_multi(hid_t dxpl_id, const hid_t *memb_dxpl)
-{
-    H5FD_multi_dxpl_t	dx;
-    H5FD_mem_t		mt;
-    htri_t              prop_exists;            /* Whether the multi VFD DXPL property already exists */
-    static const char *func = "H5FDset_dxpl_multi";  /* Function Name for error reporting */
-
-    /*NO TRACE*/
-
-    /* Clear the error stack */
-    H5Eclear2(H5E_DEFAULT);
-
-    /* Check arguments */
-    if(TRUE != H5Pisa_class(dxpl_id,  H5P_DATASET_XFER))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not a data transfer property list", -1)
-    if(!memb_dxpl)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "invalid pointer", -1)
-    for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
-        if(memb_dxpl[mt] != H5P_DEFAULT && TRUE != H5Pisa_class(memb_dxpl[mt], H5P_DATASET_XFER))
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not a data transfer property list", -1)
-    } /* end for */
-
-    /* Check for existence of multi VFD DXPL property in DXPL */
-    if((prop_exists = H5Pexist(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME)) < 0)
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't check for multi VFD property", -1)
-
-    /* Copy the DXPLs to internal property, converting "generic" default
-     * property lists into default dataset transfer property lists */
-    for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
-        if(memb_dxpl[mt] == H5P_DEFAULT)
-            dx.memb_dxpl[mt] = H5P_DATASET_XFER_DEFAULT;
-        else {
-            if((dx.memb_dxpl[mt] = H5Pcopy(memb_dxpl[mt])) < 0)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTCOPY, "can't copy dataset transfer property list", -1)
-        } /* end else */
-    } /* end for */
-
-    /* Clear previous property, if it exists */
-    if(prop_exists) {
-        H5FD_multi_dxpl_t	old_dx;
-
-        /* Get the old DXPL value */
-        if(H5Pget(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME, &old_dx) < 0)
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't get previous property value", -1)
-
-        ALL_MEMBERS(mt) {
-            if(old_dx.memb_dxpl[mt] >= 0)
-                if(H5Pclose(old_dx.memb_dxpl[mt]) < 0)
-                    H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTCLOSEOBJ, "can't close property list", -1)
-        } END_MEMBERS;
-
-        /* Set the new value */
-        if(H5Pset(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME, &dx) < 0)
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't get previous property value", -1)
-    } /* end if */
-    else {
-        /* Insert multi VFD DXPL property into property list */
-        if(H5Pinsert2(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME, H5FD_MULTI_DXPL_PROP_SIZE, &dx, NULL, NULL, NULL, H5FD_multi_dxpl_copy_cb, H5FD_multi_dxpl_cmp_cb, H5FD_multi_dxpl_cls_cb) < 0)
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTINSERT, "can't insert multi VFD DXPL property", -1)
-    } /* end else */
-
-    return 0;
-} /* end H5Pset_dxpl_multi() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_dxpl_multi
- *
- * Purpose:	Returns information which was set with H5Pset_dxpl_multi()
- *		above.
- *
- * Return:	Success:	0
- *
- *		Failure:	-1
- *
- * Programmer:	Robb Matzke
- *              Tuesday, August 10, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_dxpl_multi(hid_t dxpl_id, hid_t *memb_dxpl/*out*/)
-{
-    H5FD_multi_dxpl_t	dx;
-    H5FD_mem_t		mt;
-    htri_t              prop_exists;            /* Whether the multi VFD DXPL property already exists */
-    static const char *func = "H5FDget_dxpl_multi";  /* Function Name for error reporting */
-
-    /*NO TRACE*/
-
-    /* Clear the error stack */
-    H5Eclear2(H5E_DEFAULT);
-
-    /* Argument checking */
-    if(TRUE != H5Pisa_class(dxpl_id, H5P_DATASET_XFER))
-        H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not a file access property list", -1)
-
-    if(memb_dxpl) {
-        /* Check for existence of multi VFD DXPL property in DXPL */
-        if((prop_exists = H5Pexist(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME)) < 0)
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't check for multi VFD property", -1)
-        if(!prop_exists)
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "multi VFD DXPL property not set", -1)
-
-        /* Get the DXPL value */
-        if(H5Pget(dxpl_id, H5FD_MULTI_DXPL_PROP_NAME, &dx) < 0)
-            H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTGET, "can't get property value", -1)
-
-        /* Deep copy the multi VFD DXPL value */
-	for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
-	    if(dx.memb_dxpl[mt] >= 0)
-		memb_dxpl[mt] = H5Pcopy(dx.memb_dxpl[mt]);
-	    else
-		memb_dxpl[mt] = dx.memb_dxpl[mt]; /*default or bad ID */
-	} /* end for */
-    } /* end if */
-
-    return 0;
-} /* end H5Pget_dxpl_multi() */
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5FD_multi_sb_size
diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h
index da16b0c..e819e74 100644
--- a/src/H5FDmulti.h
+++ b/src/H5FDmulti.h
@@ -34,9 +34,6 @@ H5_DLL herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
 H5_DLL herr_t H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
 			 hid_t *memb_fapl/*out*/, char **memb_name/*out*/,
 			 haddr_t *memb_addr/*out*/, hbool_t *relax/*out*/);
-H5_DLL herr_t H5Pset_dxpl_multi(hid_t dxpl_id, const hid_t *memb_dxpl);
-H5_DLL herr_t H5Pget_dxpl_multi(hid_t dxpl_id, hid_t *memb_dxpl/*out*/);
-
 H5_DLL herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext,
 			 hid_t meta_plist_id, const char *raw_ext,
 			 hid_t raw_plist_id);