diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-27 18:21:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 18:21:00 (GMT) |
| commit | 00f5d01c8345d9718ca43aa8ca98bf6cfc05b70d (patch) | |
| tree | 725a5146d5a21ff3d10adbbf6038d154d78c6328 /java/src/jni/h5pDXPLImp.c | |
| parent | aa9c06135979ee1415b41ea1bccc15524fbfca82 (diff) | |
| download | hdf5-00f5d01c8345d9718ca43aa8ca98bf6cfc05b70d.zip hdf5-00f5d01c8345d9718ca43aa8ca98bf6cfc05b70d.tar.gz hdf5-00f5d01c8345d9718ca43aa8ca98bf6cfc05b70d.tar.bz2 | |
Normalize java w/ develop (#3283)
Diffstat (limited to 'java/src/jni/h5pDXPLImp.c')
| -rw-r--r-- | java/src/jni/h5pDXPLImp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/jni/h5pDXPLImp.c b/java/src/jni/h5pDXPLImp.c index 6a11c0e..7926db1 100644 --- a/java/src/jni/h5pDXPLImp.c +++ b/java/src/jni/h5pDXPLImp.c @@ -171,17 +171,17 @@ done: JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1preserve(JNIEnv *env, jclass clss, jlong plist, jboolean status) { - hbool_t st = JNI_FALSE; - herr_t retVal = FAIL; + bool st = JNI_FALSE; + herr_t retVal = FAIL; UNUSED(clss); if (JNI_TRUE == status) - st = TRUE; + st = true; else if (JNI_FALSE == status) st = false; else - H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_preserve: status not TRUE or FALSE"); + H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_preserve: status not true or false"); if ((retVal = H5Pset_preserve((hid_t)plist, st)) < 0) H5_LIBRARY_ERROR(ENVONLY); @@ -301,7 +301,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform(JNIEnv *env, jclass clss, jlong plis if ((express_size = H5Pget_data_transform((hid_t)plist_id, (char *)NULL, (size_t)size)) < 0) H5_LIBRARY_ERROR(ENVONLY); - if (NULL == (express = (char *)HDmalloc(sizeof(char) * (size_t)express_size + 1))) + if (NULL == (express = (char *)malloc(sizeof(char) * (size_t)express_size + 1))) H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_data_transform: memory allocation failed"); if (H5Pget_data_transform((hid_t)plist_id, express, (size_t)express_size + 1) < 0) @@ -319,7 +319,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform(JNIEnv *env, jclass clss, jlong plis done: if (express) - HDfree(express); + free(express); return (jlong)express_size; } /* end Java_hdf_hdf5lib_H5_H5Pget_1data_1transform */ |