From cb0f2f72c26c1618fde304f9da1d58d7073dfae8 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Fri, 21 Apr 2000 10:00:49 -0500 Subject: [svn-r2172] Fixed a few typos in FUNC_ENTER macros and return types that Binh-Minh found. --- src/H5P.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/H5P.c b/src/H5P.c index 873c258..357fccc 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -860,7 +860,7 @@ H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size) { H5F_create_t *plist = NULL; - FUNC_ENTER(H5Pset_sizeof_addr, FAIL); + FUNC_ENTER(H5Pset_sizes, FAIL); H5TRACE3("e","izz",plist_id,sizeof_addr,sizeof_size); /* Check arguments */ @@ -1909,13 +1909,13 @@ H5Pget_hyper_cache(hid_t plist_id, unsigned *cache/*out*/, { H5F_xfer_t *plist = NULL; - FUNC_ENTER (H5Pget_hyper_cache, 0); + FUNC_ENTER (H5Pget_hyper_cache, FAIL); H5TRACE3("e","ixx",plist_id,cache,limit); /* Check arguments */ if (H5P_DATA_XFER != H5P_get_class (plist_id) || NULL == (plist = H5I_object (plist_id))) { - HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, 0, + HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list"); } @@ -1988,7 +1988,7 @@ H5Pget_preserve(hid_t plist_id) { H5F_xfer_t *plist = NULL; - FUNC_ENTER (H5Pset_preserve, FAIL); + FUNC_ENTER (H5Pget_preserve, FAIL); H5TRACE1("Is","i",plist_id); /* Check arguments */ @@ -2159,22 +2159,22 @@ H5Pget_filter(hid_t plist_id, int idx, unsigned int *flags/*out*/, H5D_create_t *plist = NULL; size_t i; - FUNC_ENTER (H5Pget_filter, FAIL); + FUNC_ENTER (H5Pget_filter, H5Z_FILTER_ERROR); H5TRACE7("Zf","iIsx*zxzx",plist_id,idx,flags,cd_nelmts,cd_values,namelen, name); /* Check arguments */ if (H5P_DATA_XFER==H5P_get_class(plist_id)) { - HRETURN_ERROR(H5E_PLINE, H5E_UNSUPPORTED, FAIL, + HRETURN_ERROR(H5E_PLINE, H5E_UNSUPPORTED, H5Z_FILTER_ERROR, "transient filters are not supported yet"); } if (H5P_DATASET_CREATE!=H5P_get_class (plist_id) || NULL==(plist=H5I_object (plist_id))) { - HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, + HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, H5Z_FILTER_ERROR, "not a dataset creation property list"); } if (idx<0 || (size_t)idx>=plist->pline.nfilters) { - HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, + HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "filter number is invalid"); } if (cd_nelmts || cd_values) { @@ -2185,11 +2185,11 @@ H5Pget_filter(hid_t plist_id, int idx, unsigned int *flags/*out*/, * is unimportant because the H5O layer will detect when a message * is too large. */ - HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, + HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "probable uninitialized *cd_nelmts argument"); } if (cd_nelmts && *cd_nelmts>0 && !cd_values) { - HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, + HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "client data values not supplied"); } /* -- cgit v0.12