mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-11 16:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r3993] Purpose:

Browse Source 
Bug fix for Pablo integration
Description:
    Several API functions were using FUNC_ENTER, without using FUNC_LEAVE,
    HRETURN or HRETURN_ERROR to leave the function.  (Using "plain" 'return'
    statements instead).
Solution:
    Changed return statements to FUNC_LEAVE, HRETURN or HRETURN_ERROR, as
    appropriate.
Platforms tested:
    FreeBSD 4.3 (hawkwind)
This commit is contained in:
Quincey Koziol 2001-06-11 17:35:08 -05:00
parent dbdeacb7ad
commit 4d245ec856
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/H5FD.c
View File

@ -983,17 +983,17 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
FUNC_ENTER(H5FD_cmp, -1); /*return value is arbitrary*/ FUNC_ENTER(H5FD_cmp, -1); /*return value is arbitrary*/
if ((!f1 || !f1->cls) && (!f2 || !f2->cls)) return 0; if ((!f1 || !f1->cls) && (!f2 || !f2->cls)) HRETURN(0);
if (!f1 || !f1->cls) return -1; if (!f1 || !f1->cls) HRETURN(-1);
if (!f2 || !f2->cls) return 1; if (!f2 || !f2->cls) HRETURN(1);
if (f1->cls < f2->cls) return -1; if (f1->cls < f2->cls) HRETURN(-1);
if (f1->cls > f2->cls) return 1; if (f1->cls > f2->cls) HRETURN(1);
/* Files are same driver; no cmp callback */ /* Files are same driver; no cmp callback */
if (!f1->cls->cmp) { if (!f1->cls->cmp) {
if (f1<f2) return -1; if (f1<f2) HRETURN(-1);
if (f1>f2) return 1; if (f1>f2) HRETURN(1);
return 0; HRETURN(0);
} }
ret_value = (f1->cls->cmp)(f1, f2); ret_value = (f1->cls->cmp)(f1, f2);

3
src/H5FL.c
View File

@ -1132,7 +1132,8 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj)
H5MM_xfree(obj); H5MM_xfree(obj);
#else /* NO_ARR_FREE_LISTS */ #else /* NO_ARR_FREE_LISTS */
/* The H5MM_xfree code allows obj to null */ /* The H5MM_xfree code allows obj to null */
if (!obj) return (NULL); if (!obj)
HRETURN (NULL);
/* Double check parameters */ /* Double check parameters */
assert(head); assert(head);

2
src/H5P.c
View File

@ -631,7 +631,7 @@ H5Pcopy(hid_t plist_id)
H5TRACE1("i","i",plist_id); H5TRACE1("i","i",plist_id);
if (H5P_DEFAULT==plist_id) if (H5P_DEFAULT==plist_id)
return H5P_DEFAULT; HRETURN(H5P_DEFAULT);
/* Check args */ /* Check args */
if (NULL == (plist = H5I_object(plist_id)) || if (NULL == (plist = H5I_object(plist_id)) ||