diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-19 04:55:57 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-19 04:55:57 (GMT) |
commit | 560110dbc7df26adb2a6f68e098fa1d4f37d3a6c (patch) | |
tree | dbf5a255580ed2eb6c250421550e62c98252f4bc /java/src/jni/h5oImp.c | |
parent | a37795d8b98322ab7dfff0b10c96f1d677ab5985 (diff) | |
download | hdf5-560110dbc7df26adb2a6f68e098fa1d4f37d3a6c.zip hdf5-560110dbc7df26adb2a6f68e098fa1d4f37d3a6c.tar.gz hdf5-560110dbc7df26adb2a6f68e098fa1d4f37d3a6c.tar.bz2 |
Removes the HD prefix from java C99 calls (#3149)
POSIX calls (HDstrndup, etc.) are unchanged
Diffstat (limited to 'java/src/jni/h5oImp.c')
-rw-r--r-- | java/src/jni/h5oImp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c index 28318a2..c97d7da 100644 --- a/java/src/jni/h5oImp.c +++ b/java/src/jni/h5oImp.c @@ -63,7 +63,7 @@ create_H5O_token_t(JNIEnv *envptr, const H5O_token_t *token, bool is_critical_pi PIN_BYTE_ARRAY(envptr, tokenByteBuf, token_buf, &token_buf_is_copy, "create_H5O_token_t: object token buffer not pinned"); - HDmemcpy(token_buf, token, sizeof(H5O_token_t)); + memcpy(token_buf, token, sizeof(H5O_token_t)); if (is_critical_pinning) UNPIN_ARRAY_CRITICAL(envptr, tokenByteBuf, token_buf, 0); @@ -756,7 +756,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment(JNIEnv *env, jclass clss, jlong loc_id) H5_LIBRARY_ERROR(ENVONLY); if (buf_size) { - if (NULL == (oComment = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1))) + if (NULL == (oComment = (char *)malloc(sizeof(char) * (size_t)buf_size + 1))) H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Oget_comment: failed to allocate object comment buffer"); if ((status = H5Oget_comment((hid_t)loc_id, oComment, (size_t)buf_size + 1)) < 0) @@ -769,7 +769,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment(JNIEnv *env, jclass clss, jlong loc_id) done: if (oComment) - HDfree(oComment); + free(oComment); return (jstring)str; } /* end Java_hdf_hdf5lib_H5_H5Oget_1comment */ @@ -801,7 +801,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name(JNIEnv *env, jclass clss, jlong lo H5_LIBRARY_ERROR(ENVONLY); if (buf_size) { - if (NULL == (objComment = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1))) + if (NULL == (objComment = (char *)malloc(sizeof(char) * (size_t)buf_size + 1))) H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Oget_comment_by_name: failed to allocate buffer for object comment"); @@ -816,7 +816,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name(JNIEnv *env, jclass clss, jlong lo done: if (objComment) - HDfree(objComment); + free(objComment); if (objName) UNPIN_JAVA_STRING(ENVONLY, name, objName); @@ -916,7 +916,7 @@ Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token(JNIEnv *env, jclass clss, jlong loc_id, PIN_BYTE_ARRAY(ENVONLY, (jbyteArray)token_data, token_buf, &token_buf_is_copy, "H5Oopen_by_token: token buffer not pinned"); - HDmemcpy(&obj_token, token_buf, sizeof(H5O_token_t)); + memcpy(&obj_token, token_buf, sizeof(H5O_token_t)); UNPIN_BYTE_ARRAY(ENVONLY, (jbyteArray)token_data, token_buf, JNI_ABORT); token_buf = NULL; |