summaryrefslogtreecommitdiffstats
path: root/java/src/jni/h5tImp.c
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-06-19 04:55:57 (GMT)
committerGitHub <noreply@github.com>2023-06-19 04:55:57 (GMT)
commit560110dbc7df26adb2a6f68e098fa1d4f37d3a6c (patch)
treedbf5a255580ed2eb6c250421550e62c98252f4bc /java/src/jni/h5tImp.c
parenta37795d8b98322ab7dfff0b10c96f1d677ab5985 (diff)
downloadhdf5-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/h5tImp.c')
-rw-r--r--java/src/jni/h5tImp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/java/src/jni/h5tImp.c b/java/src/jni/h5tImp.c
index b4fc817..60de0c3 100644
--- a/java/src/jni/h5tImp.c
+++ b/java/src/jni/h5tImp.c
@@ -1189,7 +1189,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int(JNIEnv *env, jclass clss, jlong type_id
if (size <= 0)
H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tenum_nameof_int: name size < 0");
- if (NULL == (nameP = (char *)HDmalloc(sizeof(char) * (size_t)size)))
+ if (NULL == (nameP = (char *)malloc(sizeof(char) * (size_t)size)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tenum_nameof_int: failed to allocate name buffer");
PIN_INT_ARRAY(ENVONLY, value, intP, &isCopy, "H5Tenum_nameof_int: value not pinned");
@@ -1208,7 +1208,7 @@ done:
if (intP)
UNPIN_INT_ARRAY(ENVONLY, value, intP, JNI_ABORT);
if (nameP)
- HDfree(nameP);
+ free(nameP);
return (jint)status;
} /* end Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int */
@@ -1234,7 +1234,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof(JNIEnv *env, jclass clss, jlong type_id, jby
if (NULL == value)
H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Tenum_nameof: value is NULL");
- if (NULL == (nameP = (char *)HDmalloc(sizeof(char) * (size_t)size)))
+ if (NULL == (nameP = (char *)malloc(sizeof(char) * (size_t)size)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tenum_nameof: failed to allocate name buffer");
PIN_BYTE_ARRAY(ENVONLY, value, byteP, &isCopy, "H5Tenum_nameof: value not pinned");
@@ -1250,7 +1250,7 @@ done:
if (byteP)
UNPIN_BYTE_ARRAY(ENVONLY, value, byteP, JNI_ABORT);
if (nameP)
- HDfree(nameP);
+ free(nameP);
return str;
} /* end Java_hdf_hdf5lib_H5_H5Tenum_1nameof */
@@ -1432,7 +1432,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims(JNIEnv *env, jclass clss, jlong type_id,
H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tget_array_dims: dims array length < 0");
}
- if (NULL == (cdims = (hsize_t *)HDmalloc((size_t)dlen * sizeof(hsize_t))))
+ if (NULL == (cdims = (hsize_t *)malloc((size_t)dlen * sizeof(hsize_t))))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tget_array_dims: failed to allocate dimension buffer");
if ((ndims = H5Tget_array_dims2((hid_t)type_id, cdims)) < 0)
@@ -1444,7 +1444,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims(JNIEnv *env, jclass clss, jlong type_id,
done:
if (cdims)
- HDfree(cdims);
+ free(cdims);
if (dimsP)
UNPIN_INT_ARRAY(ENVONLY, dims, dimsP, (ndims < 0) ? JNI_ABORT : 0);
@@ -1572,7 +1572,7 @@ Java_hdf_hdf5lib_H5__1H5Tarray_1create2(JNIEnv *env, jclass clss, jlong base_id,
if (dlen != rank)
H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tarray_create: dimension array length != array rank");
- if (NULL == (cdims = (hsize_t *)HDmalloc((size_t)dlen * sizeof(hsize_t))))
+ if (NULL == (cdims = (hsize_t *)malloc((size_t)dlen * sizeof(hsize_t))))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tarray_create: failed to allocate dimension buffer");
for (i = 0; i < (size_t)dlen; i++) {
@@ -1584,7 +1584,7 @@ Java_hdf_hdf5lib_H5__1H5Tarray_1create2(JNIEnv *env, jclass clss, jlong base_id,
done:
if (cdims)
- HDfree(cdims);
+ free(cdims);
if (dimsP)
UNPIN_LONG_ARRAY(ENVONLY, dims, dimsP, (retVal < 0) ? JNI_ABORT : 0);
@@ -1618,7 +1618,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2(JNIEnv *env, jclass clss, jlong type_id
H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tarray_get_dims2: dims array length < 0");
}
- if (NULL == (cdims = (hsize_t *)HDmalloc((size_t)dlen * sizeof(hsize_t))))
+ if (NULL == (cdims = (hsize_t *)malloc((size_t)dlen * sizeof(hsize_t))))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tarray_get_dims2: failed to allocate dimension buffer");
if ((ndims = H5Tget_array_dims2((hid_t)type_id, (hsize_t *)cdims)) < 0)
@@ -1630,7 +1630,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2(JNIEnv *env, jclass clss, jlong type_id
done:
if (cdims)
- HDfree(cdims);
+ free(cdims);
if (dimsP)
UNPIN_LONG_ARRAY(ENVONLY, dims, dimsP, (ndims < 0) ? JNI_ABORT : 0);