philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1983 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:small_develop_tweaks to develop

Browse Source 
* commit '638d31a78a9ea5db438d30e78f8cbaa1146b7f87':
  Fixed the java assert issue with H5O cache corking calls.
This commit is contained in:
Dana Robinson
2019-10-03 15:34:15 -05:00
parent 35bc2d4592 638d31a78a
commit f2be6da714
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/H5I.c
View File

@@ -1109,7 +1109,8 @@ H5I_is_file_object(hid_t id)
FUNC_ENTER_NOAPI(FAIL);
/* Fail if the ID type is out of range */
HDassert(id_type >= 1 && id_type < H5I_NTYPES);
if (id_type < 1 || id_type >= H5I_NTYPES)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID type out of range");
/* Return TRUE if the ID is a file object (dataset, group, map, or committed
* datatype), FALSE otherwise.
@@ -1122,7 +1123,7 @@ H5I_is_file_object(hid_t id)
H5T_t *dt = NULL;
if(NULL == (dt = (H5T_t *)H5I_object(id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get underlying datatype struct")
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get underlying datatype struct");
ret_value = H5T_is_named(dt);
}
@@ -1131,7 +1132,7 @@ H5I_is_file_object(hid_t id)
}
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(ret_value);
} /* H5I_is_file_object() */