summaryrefslogtreecommitdiffstats
path: root/java/src/jni/h5rImp.c
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/jni/h5rImp.c')
-rw-r--r--java/src/jni/h5rImp.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c
index 7b81e80..0e26f2a 100644
--- a/java/src/jni/h5rImp.c
+++ b/java/src/jni/h5rImp.c
@@ -47,7 +47,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1object(JNIEnv *env, jclass clss, jlong loc_id, js
PIN_JAVA_STRING(ENVONLY, name, refName, NULL, "H5Rcreate_object: reference name not pinned");
- if (NULL == (refBuf = HDcalloc(1, H5R_REF_BUF_SIZE)))
+ if (NULL == (refBuf = calloc(1, H5R_REF_BUF_SIZE)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rcreate_object: failed to allocate reference buffer");
H5R_ref_t loc_ref;
@@ -55,7 +55,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1object(JNIEnv *env, jclass clss, jlong loc_id, js
H5_LIBRARY_ERROR(ENVONLY);
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(refBuf, &loc_ref, H5R_REF_BUF_SIZE);
+ memcpy(refBuf, &loc_ref, H5R_REF_BUF_SIZE);
if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -67,7 +67,7 @@ done:
if (refName)
UNPIN_JAVA_STRING(ENVONLY, name, refName);
if (refBuf)
- HDfree(refBuf);
+ free(refBuf);
return ref;
} /* end Java_hdf_hdf5lib_H5_H5Rcreate_1object */
@@ -93,7 +93,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1region(JNIEnv *env, jclass clss, jlong loc_id, js
PIN_JAVA_STRING(ENVONLY, name, refName, NULL, "H5Rcreate_region: reference name not pinned");
- if (NULL == (refBuf = HDcalloc(1, H5R_REF_BUF_SIZE)))
+ if (NULL == (refBuf = calloc(1, H5R_REF_BUF_SIZE)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rcreate_region: failed to allocate reference buffer");
H5R_ref_t loc_ref;
@@ -101,7 +101,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1region(JNIEnv *env, jclass clss, jlong loc_id, js
H5_LIBRARY_ERROR(ENVONLY);
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(refBuf, &loc_ref, H5R_REF_BUF_SIZE);
+ memcpy(refBuf, &loc_ref, H5R_REF_BUF_SIZE);
if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -113,7 +113,7 @@ done:
if (refName)
UNPIN_JAVA_STRING(ENVONLY, name, refName);
if (refBuf)
- HDfree(refBuf);
+ free(refBuf);
return ref;
} /* end Java_hdf_hdf5lib_H5_H5Rcreate_1region */
@@ -144,7 +144,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1attr(JNIEnv *env, jclass clss, jlong loc_id, jstr
PIN_JAVA_STRING(ENVONLY, name, refName, NULL, "H5Rcreate_attr: reference name not pinned");
- if (NULL == (refBuf = HDcalloc(1, H5R_REF_BUF_SIZE)))
+ if (NULL == (refBuf = calloc(1, H5R_REF_BUF_SIZE)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rcreate_attr: failed to allocate reference buffer");
H5R_ref_t loc_ref;
@@ -152,7 +152,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1attr(JNIEnv *env, jclass clss, jlong loc_id, jstr
H5_LIBRARY_ERROR(ENVONLY);
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(refBuf, &loc_ref, H5R_REF_BUF_SIZE);
+ memcpy(refBuf, &loc_ref, H5R_REF_BUF_SIZE);
if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -166,7 +166,7 @@ done:
if (refName)
UNPIN_JAVA_STRING(ENVONLY, name, refName);
if (refBuf)
- HDfree(refBuf);
+ free(refBuf);
return ref;
} /* end Java_hdf_hdf5lib_H5_H5Rcreate_1attr */
@@ -199,7 +199,7 @@ Java_hdf_hdf5lib_H5_H5Rdestroy(JNIEnv *env, jclass clss, jbyteArray ref)
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
if ((status = H5Rdestroy(&loc_ref)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@@ -237,7 +237,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1type(JNIEnv *env, jclass clss, jbyteArray ref)
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
if ((ref_type = H5Rget_type(&loc_ref)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@@ -289,8 +289,8 @@ Java_hdf_hdf5lib_H5_H5Requal(JNIEnv *env, jclass clss, jbyteArray ref1, jbyteArr
H5R_ref_t loc_ref1, loc_ref2;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref1, refBuf1, H5R_REF_BUF_SIZE);
- HDmemcpy(&loc_ref2, refBuf2, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref1, refBuf1, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref2, refBuf2, H5R_REF_BUF_SIZE);
if ((bval = H5Requal(&loc_ref1, &loc_ref2)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@@ -334,19 +334,19 @@ Java_hdf_hdf5lib_H5_H5Rcopy(JNIEnv *env, jclass clss, jbyteArray src_ref)
PIN_BYTE_ARRAY(ENVONLY, src_ref, src_refBuf, &isCopy, "H5Rcopy: src reference buffer not pinned");
- if (NULL == (dst_refBuf = HDcalloc(1, H5R_REF_BUF_SIZE)))
+ if (NULL == (dst_refBuf = calloc(1, H5R_REF_BUF_SIZE)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rcreate_attr: failed to allocate dst reference buffer");
H5R_ref_t loc_src_ref, loc_dst_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_src_ref, src_refBuf, H5R_REF_BUF_SIZE);
- HDmemcpy(&loc_dst_ref, dst_refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_src_ref, src_refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_dst_ref, dst_refBuf, H5R_REF_BUF_SIZE);
if ((status = H5Rcopy(&loc_src_ref, &loc_dst_ref)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
- HDmemcpy(dst_refBuf, &loc_dst_ref, H5R_REF_BUF_SIZE);
+ memcpy(dst_refBuf, &loc_dst_ref, H5R_REF_BUF_SIZE);
if (NULL == (dst_ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -358,7 +358,7 @@ done:
if (src_refBuf)
UNPIN_BYTE_ARRAY(ENVONLY, src_ref, src_refBuf, (status < 0) ? JNI_ABORT : 0);
if (dst_refBuf)
- HDfree(dst_refBuf);
+ free(dst_refBuf);
return dst_ref;
} /* end Java_hdf_hdf5lib_H5_H5Rcopy */
@@ -391,7 +391,7 @@ Java_hdf_hdf5lib_H5__1H5Ropen_1object(JNIEnv *env, jclass clss, jbyteArray ref,
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
if ((retVal = H5Ropen_object(&loc_ref, (hid_t)rapl_id, (hid_t)oapl_id)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@@ -431,7 +431,7 @@ Java_hdf_hdf5lib_H5__1H5Ropen_1region(JNIEnv *env, jclass clss, jbyteArray ref,
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
if ((retVal = H5Ropen_region(&loc_ref, (hid_t)rapl_id, (hid_t)oapl_id)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@@ -471,7 +471,7 @@ Java_hdf_hdf5lib_H5__1H5Ropen_1attr(JNIEnv *env, jclass clss, jbyteArray ref, jl
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
if ((retVal = H5Ropen_attr(&loc_ref, (hid_t)rapl_id, (hid_t)aapl_id)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@@ -506,7 +506,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3(JNIEnv *env, jclass clss, jbyteArray ref,
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
if ((retVal = H5Rget_obj_type3(&loc_ref, (hid_t)rapl_id, &object_info)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@@ -546,13 +546,13 @@ Java_hdf_hdf5lib_H5_H5Rget_1file_1name(JNIEnv *env, jclass clss, jbyteArray ref)
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
/* Get the length of the name */
if ((buf_size = H5Rget_file_name(&loc_ref, NULL, 0)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
- if (NULL == (namePtr = HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+ if (NULL == (namePtr = malloc(sizeof(char) * (size_t)buf_size + 1)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rget_file_name: malloc failed");
if ((check_size = H5Rget_file_name(&loc_ref, namePtr, (size_t)buf_size + 1)) < 0)
@@ -564,7 +564,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1file_1name(JNIEnv *env, jclass clss, jbyteArray ref)
done:
if (namePtr)
- HDfree(namePtr);
+ free(namePtr);
if (refBuf)
UNPIN_BYTE_ARRAY(ENVONLY, ref, refBuf, (check_size < 0) ? JNI_ABORT : 0);
@@ -596,13 +596,13 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1name(JNIEnv *env, jclass clss, jbyteArray ref,
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
/* Get the length of the name */
if ((buf_size = H5Rget_obj_name(&loc_ref, (hid_t)rapl_id, NULL, 0)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
- if (NULL == (namePtr = HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+ if (NULL == (namePtr = malloc(sizeof(char) * (size_t)buf_size + 1)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rget_obj_name: malloc failed");
if ((check_size = H5Rget_obj_name(&loc_ref, (hid_t)rapl_id, namePtr, (size_t)buf_size + 1)) < 0)
@@ -614,7 +614,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1name(JNIEnv *env, jclass clss, jbyteArray ref,
done:
if (namePtr)
- HDfree(namePtr);
+ free(namePtr);
if (refBuf)
UNPIN_BYTE_ARRAY(ENVONLY, ref, refBuf, (check_size < 0) ? JNI_ABORT : 0);
@@ -646,13 +646,13 @@ Java_hdf_hdf5lib_H5_H5Rget_1attr_1name(JNIEnv *env, jclass clss, jbyteArray ref)
H5R_ref_t loc_ref;
HDcompile_assert(H5R_REF_BUF_SIZE <= sizeof(H5R_ref_t));
- HDmemcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
+ memcpy(&loc_ref, refBuf, H5R_REF_BUF_SIZE);
/* Get the length of the name */
if ((buf_size = H5Rget_attr_name(&loc_ref, NULL, 0)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
- if (NULL == (namePtr = HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+ if (NULL == (namePtr = malloc(sizeof(char) * (size_t)buf_size + 1)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rget_attr_name: malloc failed");
if ((check_size = H5Rget_attr_name(&loc_ref, namePtr, (size_t)buf_size + 1)) < 0)
@@ -664,7 +664,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1attr_1name(JNIEnv *env, jclass clss, jbyteArray ref)
done:
if (namePtr)
- HDfree(namePtr);
+ free(namePtr);
if (refBuf)
UNPIN_BYTE_ARRAY(ENVONLY, ref, refBuf, (check_size < 0) ? JNI_ABORT : 0);
@@ -921,7 +921,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1name(JNIEnv *env, jclass clss, jlong loc_id, jint re
PIN_BYTE_ARRAY(ENVONLY, ref, refBuf, &isCopy, "H5Rget_name: reference buffer not pinned");
- if (NULL == (aName = HDmalloc(sizeof(char) * (size_t)size + 1)))
+ if (NULL == (aName = malloc(sizeof(char) * (size_t)size + 1)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rget_name: failed to allocate referenced object name buffer");
if ((ret_val = (jlong)H5Rget_name((hid_t)loc_id, (H5R_type_t)ref_type, refBuf, aName, (size_t)size + 1)) <
@@ -937,7 +937,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1name(JNIEnv *env, jclass clss, jlong loc_id, jint re
done:
if (aName)
- HDfree(aName);
+ free(aName);
if (refBuf)
UNPIN_BYTE_ARRAY(ENVONLY, ref, refBuf, JNI_ABORT);
@@ -985,7 +985,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1name_1string(JNIEnv *env, jclass clss, jlong loc_id,
if ((buf_size = H5Rget_name((hid_t)loc_id, (H5R_type_t)ref_type, refBuf, NULL, 0)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
- if (NULL == (aName = HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+ if (NULL == (aName = malloc(sizeof(char) * (size_t)buf_size + 1)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rget_name: failed to allocate referenced object name buffer");
if ((ret_val = (jlong)H5Rget_name((hid_t)loc_id, (H5R_type_t)ref_type, refBuf, aName,
@@ -998,7 +998,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1name_1string(JNIEnv *env, jclass clss, jlong loc_id,
done:
if (aName)
- HDfree(aName);
+ free(aName);
if (refBuf)
UNPIN_BYTE_ARRAY(ENVONLY, ref, refBuf, JNI_ABORT);