diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/H5FD.c | 16 | ||||
-rw-r--r-- | src/H5FL.c | 3 | ||||
-rw-r--r-- | src/H5P.c | 2 |
3 files changed, 11 insertions, 10 deletions
@@ -983,17 +983,17 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2) FUNC_ENTER(H5FD_cmp, -1); /*return value is arbitrary*/ - if ((!f1 || !f1->cls) && (!f2 || !f2->cls)) return 0; - if (!f1 || !f1->cls) return -1; - if (!f2 || !f2->cls) return 1; - if (f1->cls < f2->cls) return -1; - if (f1->cls > f2->cls) return 1; + if ((!f1 || !f1->cls) && (!f2 || !f2->cls)) HRETURN(0); + if (!f1 || !f1->cls) HRETURN(-1); + if (!f2 || !f2->cls) HRETURN(1); + if (f1->cls < f2->cls) HRETURN(-1); + if (f1->cls > f2->cls) HRETURN(1); /* Files are same driver; no cmp callback */ if (!f1->cls->cmp) { - if (f1<f2) return -1; - if (f1>f2) return 1; - return 0; + if (f1<f2) HRETURN(-1); + if (f1>f2) HRETURN(1); + HRETURN(0); } ret_value = (f1->cls->cmp)(f1, f2); @@ -1132,7 +1132,8 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj) H5MM_xfree(obj); #else /* NO_ARR_FREE_LISTS */ /* The H5MM_xfree code allows obj to null */ - if (!obj) return (NULL); + if (!obj) + HRETURN (NULL); /* Double check parameters */ assert(head); @@ -631,7 +631,7 @@ H5Pcopy(hid_t plist_id) H5TRACE1("i","i",plist_id); if (H5P_DEFAULT==plist_id) - return H5P_DEFAULT; + HRETURN(H5P_DEFAULT); /* Check args */ if (NULL == (plist = H5I_object(plist_id)) || |