diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-04-24 17:57:30 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-04-24 17:57:30 (GMT) |
| commit | 7dd53873f73ee67046607b50067b543f2a44cab3 (patch) | |
| tree | 4d08558545b8403ed43ff27ebb5bd02b8503a52e /src/H5I.c | |
| parent | 6682f51a1157dc9e88bd34528fff999aee50ca2a (diff) | |
| parent | 4fbe80acc27bc0e84eec9880c3c4257802e5bae5 (diff) | |
| download | hdf5-7dd53873f73ee67046607b50067b543f2a44cab3.zip hdf5-7dd53873f73ee67046607b50067b543f2a44cab3.tar.gz hdf5-7dd53873f73ee67046607b50067b543f2a44cab3.tar.bz2 | |
Merge branch 'develop' into H10621
Diffstat (limited to 'src/H5I.c')
| -rw-r--r-- | src/H5I.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -355,6 +355,9 @@ H5Itype_exists(H5I_type_t type) FUNC_ENTER_API(FAIL) H5TRACE1("t", "It", type); + if(H5I_IS_LIB_TYPE(type)) + HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "cannot call public function on library type") + if (type <= H5I_BADID || type >= H5I_next_type) HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number") @@ -1131,7 +1134,7 @@ done: * *------------------------------------------------------------------------- */ -void * +static void * H5I__remove_verify(hid_t id, H5I_type_t id_type) { void * ret_value = NULL; /*return value */ @@ -1940,6 +1943,8 @@ H5I__iterate_pub_cb(void H5_ATTR_UNUSED *obj, hid_t id, void *_udata) ret_value = H5_ITER_STOP; /* terminate iteration early */ else if(cb_ret_val < 0) ret_value = H5_ITER_ERROR; /* indicate failure (which terminates iteration) */ + else + ret_value = H5_ITER_CONT; /* continue iteration */ FUNC_LEAVE_NOAPI(ret_value) } /* end H5I__iterate_pub_cb() */ |