[svn-r7181] Purpose:

    Version update

Description:
    Removed 1.4 compatibility code in the library.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

1 files changed, 0 insertions, 199 deletions

diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 6c042c8..3805c68 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -31,112 +31,6 @@ static int             interface_initialize_g = 0;
 
 /* Static function prototypes */
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_buffer
- *
- * Purpose:	Given a dataset transfer property list, set the maximum size
- *		for the type conversion buffer and background buffer and
- *		optionally supply pointers to application-allocated buffers.
- *		If the buffer size is smaller than the entire amount of data
- *		being transfered between application and file, and a type
- *		conversion buffer or background buffer is required then
- *		strip mining will be used.
- *
- *		If TCONV and/or BKG are null pointers then buffers will be
- *		allocated and freed during the data transfer.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *              Monday, March 16, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_buffer(hid_t plist_id, hsize_t _size, void *tconv, void *bkg)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t size=(size_t)_size;  /* Work around size difference */
-    herr_t ret_value=SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(H5Pset_buffer, FAIL);
-    H5TRACE4("e","ihxx",plist_id,_size,tconv,bkg);
-
-    /* Check arguments */
-    if (size<=0)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "buffer size must not be zero");
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Update property list */
-    if(H5P_set(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer buffer size");
-    if(H5P_set(plist, H5D_XFER_TCONV_BUF_NAME, &tconv)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer type conversion buffer");
-    if(H5P_set(plist, H5D_XFER_BKGR_BUF_NAME, &bkg)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set background type conversion buffer");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_buffer
- *
- * Purpose:	Reads values previously set with H5Pset_buffer().
- *
- * Return:	Success:	Buffer size.
- *
- *		Failure:	0
- *
- * Programmer:	Robb Matzke
- *              Monday, March 16, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-hsize_t
-H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    size_t size;                /* Type conversion buffer size */
-    hsize_t ret_value;          /* Return value */
-
-    FUNC_ENTER_API(H5Pget_buffer, 0);
-    H5TRACE3("h","ixx",plist_id,tconv,bkg);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, 0, "can't find object for ID");
-
-    /* Return values */
-    if (tconv)
-        if(H5P_get(plist, H5D_XFER_TCONV_BUF_NAME, tconv)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, 0, "Can't get transfer type conversion buffer");
-    if (bkg)
-        if(H5P_get(plist, H5D_XFER_BKGR_BUF_NAME, bkg)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, 0, "Can't get background type conversion buffer");
-
-    /* Get the size */
-    if(H5P_get(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size)<0)
-        HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, 0, "Can't set transfer buffer size");
-
-    /* Set the return value */
-    ret_value=(hsize_t)size;
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-#else /* H5_WANT_H5_V1_4_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_buffer
@@ -240,99 +134,6 @@ done:
     FUNC_LEAVE_API(ret_value);
 }
 
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
-#ifdef H5_WANT_H5_V1_4_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_hyper_cache
- *
- * Purpose:	Given a dataset transfer property list, indicate whether to
- *		cache the hyperslab blocks during the I/O (which speeds
- *		things up) and the maximum size of the hyperslab block to
- *		cache.  If a block is smaller than to limit, it may still not
- *		be cached if no memory is available. Setting the limit to 0
- *		indicates no limitation on the size of block to attempt to
- *		cache.
- *
- *		The default is to cache blocks with no limit on block size
- *		for serial I/O and to not cache blocks for parallel I/O
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Monday, September 21, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;
-
-    FUNC_ENTER_API(H5Pset_hyper_cache, FAIL);
-    H5TRACE3("e","iIuIu",plist_id,cache,limit);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Update property list */
-    cache = (cache>0) ? 1 : 0;
-    if (H5P_set(plist,H5D_XFER_HYPER_CACHE_NAME,&cache)<0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value");
-    if (H5P_set(plist,H5D_XFER_HYPER_CACHE_LIM_NAME,&limit)<0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_hyper_cache
- *
- * Purpose:	Reads values previously set with H5Pset_hyper_cache().
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Monday, September 21, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_hyper_cache(hid_t plist_id, unsigned *cache/*out*/,
-		   unsigned *limit/*out*/)
-{
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(H5Pget_hyper_cache, FAIL);
-    H5TRACE3("e","ixx",plist_id,cache,limit);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Return values */
-    if (cache)
-        if (H5P_get(plist,H5D_XFER_HYPER_CACHE_NAME,cache)<0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value");
-    if (limit)
-        if (H5P_get(plist,H5D_XFER_HYPER_CACHE_LIM_NAME,limit)<0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_preserve