diff options
Diffstat (limited to 'java/src/jni/h5fImp.c')
| -rw-r--r-- | java/src/jni/h5fImp.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c index af06bdc..4a65a7f 100644 --- a/java/src/jni/h5fImp.c +++ b/java/src/jni/h5fImp.c @@ -126,7 +126,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1name(JNIEnv *env, jclass clss, jlong file_id) if ((buf_size = H5Fget_name((hid_t)file_id, NULL, 0)) < 0) H5_LIBRARY_ERROR(ENVONLY); - if (NULL == (namePtr = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1))) + if (NULL == (namePtr = (char *)malloc(sizeof(char) * (size_t)buf_size + 1))) H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Fget_name: malloc failed"); if ((H5Fget_name((hid_t)file_id, namePtr, (size_t)buf_size + 1)) < 0) @@ -138,7 +138,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1name(JNIEnv *env, jclass clss, jlong file_id) done: if (namePtr) - HDfree(namePtr); + free(namePtr); return str; } /* end Java_hdf_hdf5lib_H5_H5Fget_1name */ @@ -430,7 +430,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids(JNIEnv *env, jclass clss, jlong file_id, ji H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Fget_obj_ids: obj_id_list length < 0"); } - if (NULL == (id_list = (hid_t *)HDmalloc((size_t)rank * sizeof(hid_t)))) + if (NULL == (id_list = (hid_t *)malloc((size_t)rank * sizeof(hid_t)))) 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) @@ -442,7 +442,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids(JNIEnv *env, jclass clss, jlong file_id, ji done: if (id_list) - HDfree(id_list); + free(id_list); if (obj_id_listP) UNPIN_LONG_ARRAY(ENVONLY, obj_id_list, obj_id_listP, (ret_val < 0) ? JNI_ABORT : 0); @@ -688,8 +688,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status(JNIEnv *env, jclass clss, jlong { jboolean *mdc_logging_status_ptr = NULL; jboolean isCopy; - hbool_t is_enabled; - hbool_t is_currently_logging; + bool is_enabled; + bool is_currently_logging; jsize size; UNUSED(clss); @@ -729,14 +729,14 @@ done: JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong file_id, jboolean minimize) { - hbool_t minimize_val; - herr_t retVal = FAIL; + bool minimize_val; + herr_t retVal = FAIL; UNUSED(clss); - minimize_val = (minimize == JNI_TRUE) ? TRUE : FALSE; + minimize_val = (minimize == JNI_TRUE) ? true : false; - if ((retVal = H5Fset_dset_no_attrs_hint((hid_t)file_id, (hbool_t)minimize_val)) < 0) + if ((retVal = H5Fset_dset_no_attrs_hint((hid_t)file_id, (bool)minimize_val)) < 0) H5_LIBRARY_ERROR(ENVONLY); done: @@ -752,14 +752,14 @@ JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong file_id) { jboolean bval = JNI_FALSE; - hbool_t minimize = FALSE; + bool minimize = false; UNUSED(clss); - if (H5Fget_dset_no_attrs_hint((hid_t)file_id, (hbool_t *)&minimize) < 0) + if (H5Fget_dset_no_attrs_hint((hid_t)file_id, (bool *)&minimize) < 0) H5_LIBRARY_ERROR(ENVONLY); - if (minimize == TRUE) + if (minimize == true) bval = JNI_TRUE; done: |