diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-01-16 22:11:46 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-01-16 22:11:46 (GMT) |
| commit | 55670c88cfa07a4fd5a884502f8bd32768f70256 (patch) | |
| tree | 74da25151de6d1e32329dfcd62e17c863e2e3de1 /java/src/jni/h5fImp.c | |
| parent | 024f7ba09250110c19b070c9699cfbc0f9dc2b96 (diff) | |
| parent | a92c735c9b57049e8c4037d3490f7e10f8eef4d6 (diff) | |
| download | hdf5-55670c88cfa07a4fd5a884502f8bd32768f70256.zip hdf5-55670c88cfa07a4fd5a884502f8bd32768f70256.tar.gz hdf5-55670c88cfa07a4fd5a884502f8bd32768f70256.tar.bz2 | |
Merge pull request #2272 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:tr_squash to develop
* commit 'a92c735c9b57049e8c4037d3490f7e10f8eef4d6':
Squashed commit of the token_refactoring branch:
Diffstat (limited to 'java/src/jni/h5fImp.c')
| -rw-r--r-- | java/src/jni/h5fImp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c index 2eb3ad5..3b7b96c 100644 --- a/java/src/jni/h5fImp.c +++ b/java/src/jni/h5fImp.c @@ -131,7 +131,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1name H5_LIBRARY_ERROR(ENVONLY); if (NULL == (namePtr = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1))) - H5_JNI_FATAL_ERROR(ENVONLY, "H5Fget_name: malloc failed"); + H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Fget_name: malloc failed"); if ((H5Fget_name((hid_t)file_id, namePtr, (size_t)buf_size + 1)) < 0) H5_LIBRARY_ERROR(ENVONLY); @@ -446,7 +446,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids } if (NULL == (id_list = (hid_t *) HDmalloc((size_t)rank * sizeof(hid_t)))) - H5_JNI_FATAL_ERROR(ENVONLY, "H5Fget_obj_ids: malloc failed"); + H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Fget_obj_ids: malloc failed"); if ((ret_val = H5Fget_obj_ids((hid_t)file_id, (unsigned int)types, (size_t)maxObjs, id_list)) < 0) H5_LIBRARY_ERROR(ENVONLY); |