diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-07-26 21:45:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 21:45:46 (GMT) |
| commit | ae414872f50187e64cbd6cc8f076c22cf5df2d53 (patch) | |
| tree | b616f33f5daa89f213e7c64e04c63afde906e939 /java | |
| parent | 213eac2588369f75a11df6bb1788dde33c4b82e2 (diff) | |
| download | hdf5-ae414872f50187e64cbd6cc8f076c22cf5df2d53.zip hdf5-ae414872f50187e64cbd6cc8f076c22cf5df2d53.tar.gz hdf5-ae414872f50187e64cbd6cc8f076c22cf5df2d53.tar.bz2 | |
Develop clang 13 format (#1933)
* Update format source to clang 13
* More format changes
Diffstat (limited to 'java')
40 files changed, 398 insertions, 398 deletions
diff --git a/java/examples/datasets/H5Ex_D_Shuffle.java b/java/examples/datasets/H5Ex_D_Shuffle.java index 54a77c7..3d80f7d 100644 --- a/java/examples/datasets/H5Ex_D_Shuffle.java +++ b/java/examples/datasets/H5Ex_D_Shuffle.java @@ -277,7 +277,7 @@ public class H5Ex_D_Shuffle { int[] filter_config = {0}; int filter_type = -1; filter_type = H5.H5Pget_filter(dcpl_id, indx, flags, cd_nelmts, cd_values, 120, - filter_name, filter_config); + filter_name, filter_config); System.out.print("Filter " + indx + ": Type is: "); switch (H5Z_filter.get(filter_type)) { case H5Z_FILTER_DEFLATE: diff --git a/java/examples/groups/H5Ex_G_Corder.java b/java/examples/groups/H5Ex_G_Corder.java index 86a790d..79bbad6 100644 --- a/java/examples/groups/H5Ex_G_Corder.java +++ b/java/examples/groups/H5Ex_G_Corder.java @@ -42,7 +42,7 @@ public class H5Ex_G_Corder { // Create group creation property list and enable link creation order tracking. gcpl_id = H5.H5Pcreate(HDF5Constants.H5P_GROUP_CREATE); status = H5.H5Pset_link_creation_order(gcpl_id, HDF5Constants.H5P_CRT_ORDER_TRACKED + - HDF5Constants.H5P_CRT_ORDER_INDEXED); + HDF5Constants.H5P_CRT_ORDER_INDEXED); // Create primary group using the property list. if (status >= 0) diff --git a/java/examples/groups/H5Ex_G_Traverse.java b/java/examples/groups/H5Ex_G_Traverse.java index cd60f6b..61a269c 100644 --- a/java/examples/groups/H5Ex_G_Traverse.java +++ b/java/examples/groups/H5Ex_G_Traverse.java @@ -131,8 +131,8 @@ class H5L_iter_callbackT implements H5L_iterate_t { nextod.obj_token = infobuf.token; H5L_iterate_t iter_cb2 = new H5L_iter_callbackT(); return_val = H5.H5Literate_by_name(group, name, HDF5Constants.H5_INDEX_NAME, - HDF5Constants.H5_ITER_NATIVE, 0L, iter_cb2, nextod, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5_ITER_NATIVE, 0L, iter_cb2, nextod, + HDF5Constants.H5P_DEFAULT); } for (int i = 0; i < spaces; i++) System.out.print(" "); diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 4aae921..ecf5eff 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -5360,7 +5360,7 @@ public class H5 implements java.io.Serializable { String n[] = new String[1]; n[0] = new String(""); oname[0] = H5Lget_name_by_idx(loc_id, name, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, - idx, HDF5Constants.H5P_DEFAULT); + idx, HDF5Constants.H5P_DEFAULT); H5L_info_t info = H5Lget_info_by_idx(loc_id, name, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, idx, HDF5Constants.H5P_DEFAULT); type[0] = info.type; diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c index 3ccb6ef..0f135cd 100644 --- a/java/src/jni/exceptionImp.c +++ b/java/src/jni/exceptionImp.c @@ -33,7 +33,7 @@ extern "C" { #include "exceptionImp.h" extern H5E_auto2_t efunc; -extern void * edata; +extern void *edata; /*******************/ /* Local Variables */ @@ -158,7 +158,7 @@ Java_hdf_hdf5lib_H5_H5error_1on(JNIEnv *env, jclass clss) JNIEXPORT void JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0(JNIEnv *env, jobject obj, jstring file_name) { - FILE * stream = NULL; + FILE *stream = NULL; const char *file = NULL; UNUSED(obj); @@ -237,7 +237,7 @@ static jboolean H5JNIErrorClass(JNIEnv *env, const char *message, const char *className) { jstring str; - char * args[2]; + char *args[2]; jboolean retVal = JNI_FALSE; if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, message))) @@ -371,8 +371,8 @@ h5libraryError(JNIEnv *env) hid_t min_num; hid_t maj_num; hid_t stk_id = H5I_INVALID_HID; - char * args[2]; - char * msg_str = NULL; + char *args[2]; + char *msg_str = NULL; jboolean retVal = JNI_FALSE; exceptionNumbers.maj_num = 0; diff --git a/java/src/jni/h5Imp.c b/java/src/jni/h5Imp.c index 691c98c..b742e21 100644 --- a/java/src/jni/h5Imp.c +++ b/java/src/jni/h5Imp.c @@ -106,7 +106,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5get_1libversion(JNIEnv *env, jclass clss, jintArray libversion) { jboolean libversionArrayIsCopy; - int * libversionArray = NULL; + int *libversionArray = NULL; herr_t status = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c index 32bae07..b139239 100644 --- a/java/src/jni/h5aImp.c +++ b/java/src/jni/h5aImp.c @@ -157,7 +157,7 @@ Java_hdf_hdf5lib_H5_H5Aread(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_t jboolean isCriticalPinning) { jboolean readBufIsCopy; - jbyte * readBuf = NULL; + jbyte *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -224,7 +224,7 @@ Java_hdf_hdf5lib_H5_H5Awrite(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_ jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jbyte * writeBuf = NULL; + jbyte *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -286,7 +286,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1short(JNIEnv *env, jclass clss, jlong attr_id, jlon jshortArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jshort * readBuf = NULL; + jshort *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -353,7 +353,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1short(JNIEnv *env, jclass clss, jlong attr_id, jlo jshortArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jshort * writeBuf = NULL; + jshort *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -415,7 +415,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong jboolean isCriticalPinning) { jboolean readBufIsCopy; - jint * readBuf = NULL; + jint *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -482,7 +482,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jint * writeBuf = NULL; + jint *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -544,7 +544,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1long(JNIEnv *env, jclass clss, jlong attr_id, jlong jboolean isCriticalPinning) { jboolean readBufIsCopy; - jlong * readBuf = NULL; + jlong *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -611,7 +611,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1long(JNIEnv *env, jclass clss, jlong attr_id, jlon jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jlong * writeBuf = NULL; + jlong *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -673,7 +673,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1float(JNIEnv *env, jclass clss, jlong attr_id, jlon jfloatArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jfloat * readBuf = NULL; + jfloat *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -740,7 +740,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1float(JNIEnv *env, jclass clss, jlong attr_id, jlo jfloatArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jfloat * writeBuf = NULL; + jfloat *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -933,8 +933,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1string(JNIEnv *env, jclass clss, jlong attr_id, jlo size_t str_len; size_t pos; jsize i, n; - char * c_buf = NULL; - char * cstr = NULL; + char *c_buf = NULL; + char *cstr = NULL; herr_t status = FAIL; UNUSED(clss); @@ -999,7 +999,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1string(JNIEnv *env, jclass clss, jlong attr_id, jl jstring obj; size_t i, str_len; jsize n; - char * c_buf = NULL; + char *c_buf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1100,11 +1100,11 @@ Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1247,7 +1247,7 @@ Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem } case H5T_REFERENCE: { jboolean bb; - jbyte * barray = NULL; + jbyte *barray = NULL; if (NULL == (jobj = ENVPTR->NewByteArray(ENVONLY, vlSize))) CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE); @@ -1336,11 +1336,11 @@ Java_hdf_hdf5lib_H5_H5AwriteVL(JNIEnv *env, jclass clss, jlong attr_id, jlong me hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1581,7 +1581,7 @@ H5AreadVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) { jstring jstr; jsize i, n; - char ** strs = NULL; + char **strs = NULL; herr_t status = FAIL; if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) { @@ -1644,7 +1644,7 @@ H5AreadVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) size_t i; hid_t sid = H5I_INVALID_HID; jsize n; - void * readBuf = NULL; + void *readBuf = NULL; herr_t status = FAIL; HDmemset(&h5str, 0, sizeof(h5str_t)); @@ -1786,7 +1786,7 @@ H5AwriteVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) jstring obj; jsize size; jint i; - char ** writeBuf = NULL; + char **writeBuf = NULL; herr_t status = FAIL; if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) { @@ -1861,7 +1861,7 @@ H5AwriteVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) size_t i; hid_t sid = H5I_INVALID_HID; jsize n; - void * writeBuf = NULL; + void *writeBuf = NULL; herr_t status = FAIL; if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) { @@ -2040,7 +2040,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1name(JNIEnv *env, jclass clss, jlong attr_id) { jstring str = NULL; ssize_t buf_size; - char * attrName = NULL; + char *attrName = NULL; UNUSED(clss); @@ -2388,7 +2388,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id const char *objName = NULL; jstring str = NULL; ssize_t status_size = -1; - char * attrName = NULL; + char *attrName = NULL; UNUSED(clss); @@ -2711,10 +2711,10 @@ H5A_iterate_cb(hid_t g_id, const char *name, const H5A_info_t *info, void *cb_da jobject cb_info_t = NULL; jobject visit_callback = wrapper->visit_callback; jstring str; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; jvalue args[4]; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c index a20bb6c..244d13c 100644 --- a/java/src/jni/h5dImp.c +++ b/java/src/jni/h5dImp.c @@ -183,7 +183,7 @@ Java_hdf_hdf5lib_H5_H5Dread(JNIEnv *env, jclass clss, jlong dataset_id, jlong me jboolean isCriticalPinning) { jboolean readBufIsCopy; - jbyte * readBuf = NULL; + jbyte *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -240,7 +240,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite(JNIEnv *env, jclass clss, jlong dataset_id, jlong m jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jbyte * writeBuf = NULL; + jbyte *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -338,7 +338,7 @@ Java_hdf_hdf5lib_H5_H5Dvlen_1reclaim(JNIEnv *env, jclass clss, jlong type_id, jl { #ifndef H5_NO_DEPRECATED_SYMBOLS jboolean vlenBufIsCopy; - jbyte * vlenBuf = NULL; + jbyte *vlenBuf = NULL; #endif herr_t status = FAIL; @@ -380,7 +380,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1short(JNIEnv *env, jclass clss, jlong dataset_id, j jshortArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jshort * readBuf = NULL; + jshort *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -437,7 +437,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1short(JNIEnv *env, jclass clss, jlong dataset_id, jshortArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jshort * writeBuf = NULL; + jshort *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -494,7 +494,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1int(JNIEnv *env, jclass clss, jlong dataset_id, jlo jboolean isCriticalPinning) { jboolean readBufIsCopy; - jint * readBuf = NULL; + jint *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -551,7 +551,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1int(JNIEnv *env, jclass clss, jlong dataset_id, jl jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jint * writeBuf = NULL; + jint *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -608,7 +608,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1long(JNIEnv *env, jclass clss, jlong dataset_id, jl jlongArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jlong * readBuf = NULL; + jlong *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -665,7 +665,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1long(JNIEnv *env, jclass clss, jlong dataset_id, j jlongArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jlong * writeBuf = NULL; + jlong *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -722,7 +722,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1float(JNIEnv *env, jclass clss, jlong dataset_id, j jfloatArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jfloat * readBuf = NULL; + jfloat *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -779,7 +779,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1float(JNIEnv *env, jclass clss, jlong dataset_id, jfloatArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jfloat * writeBuf = NULL; + jfloat *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -952,8 +952,8 @@ Java_hdf_hdf5lib_H5_H5Dread_1string(JNIEnv *env, jclass clss, jlong dataset_id, size_t str_len; size_t pos; jsize i, n; - char * c_buf = NULL; - char * cstr = NULL; + char *c_buf = NULL; + char *cstr = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1020,7 +1020,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1string(JNIEnv *env, jclass clss, jlong dataset_id, jstring obj; size_t i, str_len; jsize n; - char * c_buf = NULL; + char *c_buf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1115,11 +1115,11 @@ Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1263,7 +1263,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong } case H5T_REFERENCE: { jboolean bb; - jbyte * barray = NULL; + jbyte *barray = NULL; if (NULL == (jobj = ENVPTR->NewByteArray(ENVONLY, vlSize))) CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE); @@ -1345,11 +1345,11 @@ Java_hdf_hdf5lib_H5_H5DwriteVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1595,7 +1595,7 @@ H5DreadVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, { jstring jstr; jsize i, n; - char ** strs = NULL; + char **strs = NULL; herr_t status = FAIL; if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) { @@ -1660,7 +1660,7 @@ H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid size_t i; hid_t mem_space = mem_sid; jsize n; - void * readBuf = NULL; + void *readBuf = NULL; herr_t status = FAIL; HDmemset(&h5str, 0, sizeof(h5str_t)); @@ -1821,7 +1821,7 @@ H5DwriteVL_str(JNIEnv *env, hid_t dataset_id, hid_t mem_type_id, hid_t mem_space jstring obj; jsize size; jint i; - char ** writeBuf = NULL; + char **writeBuf = NULL; herr_t status = FAIL; if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) { @@ -1898,7 +1898,7 @@ H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_si size_t i; hid_t mem_space = mem_sid; jsize n; - void * writeBuf = NULL; + void *writeBuf = NULL; herr_t status = FAIL; if (mem_space == H5S_ALL) { @@ -2206,8 +2206,8 @@ Java_hdf_hdf5lib_H5_H5Dfill(JNIEnv *env, jclass clss, jbyteArray fill, jlong fil jboolean isCopy1; jboolean isCopy2; herr_t status = FAIL; - jbyte * fillP = NULL; - jbyte * buffP = NULL; + jbyte *fillP = NULL; + jbyte *buffP = NULL; UNUSED(clss); @@ -2248,7 +2248,7 @@ Java_hdf_hdf5lib_H5_H5Dset_1extent(JNIEnv *env, jclass clss, jlong loc_id, jlong hsize_t *dims = NULL; herr_t status; jsize rank; - jlong * dimsBuf = NULL; + jlong *dimsBuf = NULL; int i = 0; UNUSED(clss); @@ -2288,10 +2288,10 @@ H5D_iterate_cb(void *elem, hid_t elem_id, unsigned ndim, const hsize_t *point, v jmethodID mid; jobject visit_callback = wrapper->visit_callback; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = FAIL; jsize size; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE); @@ -2350,7 +2350,7 @@ Java_hdf_hdf5lib_H5_H5Diterate(JNIEnv *env, jclass clss, jbyteArray buf, jlong b { cb_wrapper wrapper = {callback_op, op_data}; jboolean isCopy; - jbyte * iterBuf = NULL; + jbyte *iterBuf = NULL; herr_t status = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c index 5bdeae8..0eec54f 100644 --- a/java/src/jni/h5eImp.c +++ b/java/src/jni/h5eImp.c @@ -284,7 +284,7 @@ Java_hdf_hdf5lib_H5_H5Eget_1class_1name(JNIEnv *env, jclass clss, jlong cls_id) { jstring str = NULL; ssize_t buf_size; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -435,8 +435,8 @@ Java_hdf_hdf5lib_H5_H5Eget_1msg(JNIEnv *env, jclass clss, jlong msg_id, jintArra H5E_type_t error_msg_type; jstring str = NULL; ssize_t buf_size; - jint * theArray = NULL; - char * namePtr = NULL; + jint *theArray = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -506,9 +506,9 @@ H5E_walk_cb(int nindx, const H5E_error2_t *info, void *cb_data) jstring str1, str2, str3; jobject cb_info_t = NULL; jvalue args[7]; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = FAIL; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c index e59a69e..2d2b0f2 100644 --- a/java/src/jni/h5fImp.c +++ b/java/src/jni/h5fImp.c @@ -119,7 +119,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1name(JNIEnv *env, jclass clss, jlong file_id) { jstring str = NULL; ssize_t buf_size; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -416,8 +416,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids(JNIEnv *env, jclass clss, jlong file_id, ji ssize_t ret_val = -1; size_t i; jsize rank; - jlong * obj_id_listP = NULL; - hid_t * id_list = NULL; + jlong *obj_id_listP = NULL; + hid_t *id_list = NULL; UNUSED(clss); @@ -517,7 +517,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size(JNIEnv *env, jclass clss, jlong file_id, j { jboolean isCopy; size_t max_size = 0, min_clean_size = 0, cur_size = 0; - jlong * metadata_cache_ptr = NULL; + jlong *metadata_cache_ptr = NULL; jsize size = 0; int cur_num_entries = -1; diff --git a/java/src/jni/h5gImp.c b/java/src/jni/h5gImp.c index a0011d8..a61cf39 100644 --- a/java/src/jni/h5gImp.c +++ b/java/src/jni/h5gImp.c @@ -276,7 +276,7 @@ Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id H5_iter_order_t corder = (H5_iter_order_t)order; H5_index_t cindex_type = (H5_index_t)index_type; H5G_info_t group_info; - const char * grpName = NULL; + const char *grpName = NULL; jobject obj = NULL; herr_t ret_val = FAIL; diff --git a/java/src/jni/h5iImp.c b/java/src/jni/h5iImp.c index 1e7821a..7bfe03c 100644 --- a/java/src/jni/h5iImp.c +++ b/java/src/jni/h5iImp.c @@ -62,7 +62,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1name_1long(JNIEnv *env, jclass clss, jlong obj_id, j { ssize_t size = -1; jstring str; - char * aName = NULL; + char *aName = NULL; UNUSED(clss); @@ -99,7 +99,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1name(JNIEnv *env, jclass clss, jlong obj_id) { jstring str = NULL; ssize_t buf_size = -1; - char * aName = NULL; + char *aName = NULL; UNUSED(clss); diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c index 43db4e9..1f2e8d8 100644 --- a/java/src/jni/h5lImp.c +++ b/java/src/jni/h5lImp.c @@ -408,7 +408,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id const char *groupName = NULL; jstring str = NULL; ssize_t status_size = -1; - char * linkName = NULL; + char *linkName = NULL; UNUSED(clss); @@ -460,7 +460,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value(JNIEnv *env, jclass clss, jlong loc_id, jstrin const char *linkName = NULL; jstring str; herr_t status; - char * linkValue = NULL; + char *linkValue = NULL; UNUSED(clss); @@ -550,7 +550,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx(JNIEnv *env, jclass clss, jlong loc_i const char *grpName = NULL; jstring str; herr_t status; - void * linkValue = NULL; + void *linkValue = NULL; UNUSED(clss); @@ -674,10 +674,10 @@ H5L_iterate_cb(hid_t g_id, const char *name, const H5L_info2_t *info, void *cb_d jobject cb_info_t = NULL; jobject visit_callback = wrapper->visit_callback; jstring str; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; jvalue args[5]; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c index 3037bc6..998a607 100644 --- a/java/src/jni/h5oImp.c +++ b/java/src/jni/h5oImp.c @@ -50,7 +50,7 @@ create_H5O_token_t(JNIEnv *envptr, const H5O_token_t *token, hbool_t is_critical jbyteArray tokenByteBuf; jboolean token_buf_is_copy; jvalue constructor_args[1]; - jbyte * token_buf = NULL; + jbyte *token_buf = NULL; jobject ret_token_obj = NULL; if (NULL == (tokenByteBuf = (*envptr)->NewByteArray(envptr, H5O_MAX_TOKEN_SIZE))) @@ -386,7 +386,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name(JNIEnv *env, jclass clss, jlo jint fields, jlong access_id) { H5O_native_info_t infobuf; - const char * objName = NULL; + const char *objName = NULL; jobject hdrinfobuf; jobject obj_ihinfobuf; jobject attr_ihinfobuf; @@ -458,7 +458,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx(JNIEnv *env, jclass clss, jlon jlong access_id) { H5O_native_info_t infobuf; - const char * grpName = NULL; + const char *grpName = NULL; jobject hdrinfobuf; jobject obj_ihinfobuf; jobject attr_ihinfobuf; @@ -557,10 +557,10 @@ H5O_iterate_cb(hid_t g_id, const char *name, const H5O_info2_t *info, void *cb_d jobject visit_callback = wrapper->visit_callback; jobject token; jstring str; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; jvalue args[12]; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = FAIL; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -747,7 +747,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment(JNIEnv *env, jclass clss, jlong loc_id) jstring str = NULL; ssize_t buf_size; ssize_t status = -1; - char * oComment = NULL; + char *oComment = NULL; UNUSED(clss); @@ -787,7 +787,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name(JNIEnv *env, jclass clss, jlong lo jstring str = NULL; ssize_t buf_size; ssize_t status; - char * objComment = NULL; + char *objComment = NULL; UNUSED(clss); @@ -899,7 +899,7 @@ Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token(JNIEnv *env, jclass clss, jlong loc_id, jboolean token_buf_is_copy; jfieldID token_data_field_id; jclass token_cls; - jbyte * token_buf = NULL; + jbyte *token_buf = NULL; jobject token_data; hid_t retVal = H5I_INVALID_HID; diff --git a/java/src/jni/h5pDAPLImp.c b/java/src/jni/h5pDAPLImp.c index 82802b9..01108b3 100644 --- a/java/src/jni/h5pDAPLImp.c +++ b/java/src/jni/h5pDAPLImp.c @@ -66,8 +66,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache(JNIEnv *env, jclass clss, jlong dapl, j { jboolean isCopy; jdouble *w0Array = NULL; - jlong * rdcc_nslotsArray = NULL; - jlong * nbytesArray = NULL; + jlong *rdcc_nslotsArray = NULL; + jlong *nbytesArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -140,7 +140,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix(JNIEnv *env, jclass clss, jlong dapl_id) { ssize_t prefix_size = -1; - char * pre = NULL; + char *pre = NULL; jstring str = NULL; UNUSED(clss); @@ -282,8 +282,8 @@ H5D_append_cb(hid_t dataset_id, hsize_t *cur_dims, void *cb_data) jmethodID mid; jobject visit_callback = wrapper->visit_callback; jclass cls; - JNIEnv * cbenv = NULL; - void * op_data = (void *)wrapper->op_data; + JNIEnv *cbenv = NULL; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5pDCPLImp.c b/java/src/jni/h5pDCPLImp.c index 760a5a8..f549800 100644 --- a/java/src/jni/h5pDCPLImp.c +++ b/java/src/jni/h5pDCPLImp.c @@ -82,8 +82,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1chunk(JNIEnv *env, jclass clss, jlong plist, jint nd size_t i; size_t rank; jsize arrLen; - jbyte * theArray = NULL; - jlong * jlp = NULL; + jbyte *theArray = NULL; + jlong *jlp = NULL; herr_t status = FAIL; UNUSED(clss); @@ -136,7 +136,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk(JNIEnv *env, jclass clss, jlong plist, jint ma { jboolean isCopy; hsize_t *da = NULL; - jlong * theArray = NULL; + jlong *theArray = NULL; jsize arrLen; int i; herr_t status = FAIL; @@ -285,7 +285,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id jbyteArray value) { jboolean isCopy; - jbyte * byteP = NULL; + jbyte *byteP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -319,7 +319,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id { jboolean isCopy; herr_t status = FAIL; - jbyte * byteP = NULL; + jbyte *byteP = NULL; UNUSED(clss); @@ -348,7 +348,7 @@ Java_hdf_hdf5lib_H5_H5Pfill_1value_1defined(JNIEnv *env, jclass clss, jlong plis { H5D_fill_value_t value = H5D_FILL_VALUE_ERROR; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -399,7 +399,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fill_1time(JNIEnv *env, jclass clss, jlong plist, ji { H5D_fill_time_t time = H5D_FILL_TIME_ERROR; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -450,7 +450,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time(JNIEnv *env, jclass clss, jlong plist, j { H5D_alloc_time_t time = H5D_ALLOC_TIME_ERROR; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -482,7 +482,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1filter(JNIEnv *env, jclass clss, jlong plist, jint f jlong cd_nelmts, jintArray cd_values) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -559,10 +559,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter(JNIEnv *env, jclass clss, jlong plist, jint f { jboolean isCopy; jstring str; - jint * flagsArray = NULL; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - char * filter = NULL; + jint *flagsArray = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + char *filter = NULL; herr_t status = FAIL; UNUSED(clss); @@ -633,11 +633,11 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter2(JNIEnv *env, jclass clss, jlong plist, jint { jboolean isCopy; jstring str; - jint * flagsArray = NULL; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - jint * filter_configArray = NULL; - char * filter = NULL; + jint *flagsArray = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + jint *filter_configArray = NULL; + char *filter = NULL; herr_t status = FAIL; UNUSED(clss); @@ -731,10 +731,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id(JNIEnv *env, jclass clss, jlong plist { jboolean isCopy; jstring str; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - jint * flagsArray = NULL; - char * aName = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + jint *flagsArray = NULL; + char *aName = NULL; long bs; int rank; herr_t status = FAIL; @@ -817,12 +817,12 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2(JNIEnv *env, jclass clss, jlong plis { jboolean isCopy; jstring str; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - jint * flagsArray = NULL; - jint * filter_configArray = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + jint *flagsArray = NULL; + jint *filter_configArray = NULL; long bs; - char * aName = NULL; + char *aName = NULL; herr_t status = FAIL; UNUSED(clss); @@ -901,7 +901,7 @@ Java_hdf_hdf5lib_H5_H5Pmodify_1filter(JNIEnv *env, jclass clss, jlong plist, jin jlong cd_nelmts, jintArray cd_values) { jboolean isCopy; - jint * cd_valuesP = NULL; + jint *cd_valuesP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1086,8 +1086,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1external(JNIEnv *env, jclass clss, jlong plist, jint hsize_t s; off_t o; jsize arrLen; - jlong * theArray = NULL; - char * file = NULL; + jlong *theArray = NULL; + char *file = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1219,7 +1219,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx) { ssize_t buf_size; - char * dname = NULL; + char *dname = NULL; jstring str = NULL; UNUSED(clss); @@ -1258,7 +1258,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx) { ssize_t buf_size; - char * fname = NULL; + char *fname = NULL; jstring str = NULL; UNUSED(clss); @@ -1361,7 +1361,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1prefix(JNIEnv *env, jclass clss, jlong dapl_id) { ssize_t prefix_size = -1; - char * pre = NULL; + char *pre = NULL; jstring str = NULL; UNUSED(clss); diff --git a/java/src/jni/h5pDXPLImp.c b/java/src/jni/h5pDXPLImp.c index c555d53..6a11c0e 100644 --- a/java/src/jni/h5pDXPLImp.c +++ b/java/src/jni/h5pDXPLImp.c @@ -41,8 +41,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1buffer(JNIEnv *env, jclass clss, jlong plist, jlong { #ifdef notdef jboolean isCopy; - jbyte * tconvP = NULL; - jbyte * bkgP = NULL; + jbyte *tconvP = NULL; + jbyte *bkgP = NULL; #endif herr_t status = FAIL; @@ -88,8 +88,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1buffer(JNIEnv *env, jclass clss, jlong plist, jbyteA { #ifdef notdef jboolean isCopy; - jbyte * tconvP = NULL; - jbyte * bkgP = NULL; + jbyte *tconvP = NULL; + jbyte *bkgP = NULL; #endif herr_t status = FAIL; @@ -290,7 +290,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform(JNIEnv *env, jclass clss, jlong plis jlong size) { jstring str = NULL; - char * express = NULL; + char *express = NULL; ssize_t express_size = -1; UNUSED(clss); @@ -361,7 +361,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1hyper_1vector_1size(JNIEnv *env, jclass clss, jlong { jboolean isCopy; size_t size; - jlong * theArray = NULL; + jlong *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pFAPLImp.c b/java/src/jni/h5pFAPLImp.c index ad85aae..f094aaf 100644 --- a/java/src/jni/h5pFAPLImp.c +++ b/java/src/jni/h5pFAPLImp.c @@ -127,7 +127,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core(JNIEnv *env, jclass clss, jlong fapl_id, { jboolean isCopy; jboolean *backArray = NULL; - jlong * incArray = NULL; + jlong *incArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -208,7 +208,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1direct(JNIEnv *env, jclass clss, jlong fapl_id { #ifdef H5_HAVE_DIRECT jboolean isCopy; - jlong * theArray = NULL; + jlong *theArray = NULL; size_t alignment = 0; size_t block_size = 0; size_t cbuf_size = 0; @@ -283,8 +283,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family(JNIEnv *env, jclass clss, jlong tid, jl jboolean isCopy; hsize_t *sa = NULL; size_t i; - jlong * sizeArray = NULL; - jlong * plistArray = NULL; + jlong *sizeArray = NULL; + jlong *plistArray = NULL; jsize rank; herr_t status = FAIL; @@ -433,7 +433,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs(JNIEnv *env, jclass clss, jlong fapl_id, { #ifdef H5_HAVE_LIBHDFS H5FD_hdfs_fapl_t instance; - const char * str = NULL; + const char *str = NULL; jfieldID fid; jstring j_str; jclass cls; @@ -591,7 +591,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin jboolean relax) { const char *const *mName = NULL; - const char * utf8 = NULL; + const char *utf8 = NULL; jboolean isCopy; jboolean bb; jobject o; @@ -599,10 +599,10 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin jstring obj; jclass Sjc; size_t i; - jlong * thefaplArray = NULL; - jlong * theaddrArray = NULL; - jint * themapArray = NULL; - char * member_name[H5FD_MEM_NTYPES]; + jlong *thefaplArray = NULL; + jlong *theaddrArray = NULL; + jint *themapArray = NULL; + char *member_name[H5FD_MEM_NTYPES]; herr_t status = FAIL; UNUSED(clss); @@ -725,10 +725,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin jstring str; herr_t status = FAIL; size_t i; - jlong * thefaplArray = NULL; - jlong * theaddrArray = NULL; - jint * themapArray = NULL; - char ** mName = NULL; + jlong *thefaplArray = NULL; + jlong *theaddrArray = NULL; + jint *themapArray = NULL; + char **mName = NULL; int relax = 0; int retVal = 0; @@ -853,7 +853,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id, { #ifdef H5_HAVE_ROS3_VFD H5FD_ros3_fapl_t instance; - const char * str = NULL; + const char *str = NULL; jfieldID fid; jstring j_str; jclass cls; @@ -1175,7 +1175,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1alignment(JNIEnv *env, jclass clss, jlong plist, jlo hsize_t t = 0; hsize_t a = 0; jsize arrLen; - jlong * theArray = NULL; + jlong *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1237,8 +1237,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1cache(JNIEnv *env, jclass clss, jlong plist, jintArr { jboolean isCopy; jdouble *w0Array = NULL; - jlong * rdcc_nelmtsArray = NULL; - jlong * nbytesArray = NULL; + jlong *rdcc_nelmtsArray = NULL; + jlong *nbytesArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1479,7 +1479,7 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config(JNIEnv *env, jclass clss, jlong plist, jobject cache_config) { H5AC_cache_config_t cacheinfo; - const char * str = NULL; + const char *str = NULL; jfieldID fid; jstring j_str; jclass cls; @@ -1817,7 +1817,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options(JNIEnv *env, jclass clss, jlong fa ssize_t status = -1; size_t location_size; jsize arrLen; - char * lname = NULL; + char *lname = NULL; jstring str = NULL; UNUSED(clss); @@ -1997,7 +1997,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1libver_1bounds(JNIEnv *env, jclass clss, jlong fapl_id, jintArray libver) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pFCPLImp.c b/java/src/jni/h5pFCPLImp.c index ded3248..72c8869 100644 --- a/java/src/jni/h5pFCPLImp.c +++ b/java/src/jni/h5pFCPLImp.c @@ -60,7 +60,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1userblock(JNIEnv *env, jclass clss, jlong plist, jlo { jboolean isCopy; hsize_t s; - jlong * theArray = NULL; + jlong *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -110,7 +110,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1sizes(JNIEnv *env, jclass clss, jlong plist, jlongArray size) { jboolean isCopy; - jlong * theArray = NULL; + jlong *theArray = NULL; jsize arrLen; size_t ss; size_t sa; @@ -172,7 +172,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1sym_1k(JNIEnv *env, jclass clss, jlong plist, jintAr { jboolean isCopy; jsize arrLen; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -227,7 +227,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1istore_1k(JNIEnv *env, jclass clss, jlong plist, jintArray ik) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -313,8 +313,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy(JNIEnv *env, jclass clss, jlon { H5F_fspace_strategy_t thestrategy = H5F_FSPACE_STRATEGY_FSM_AGGR; /* Library default */ jboolean isCopy; - jboolean * persistArray = NULL; - jlong * thresholdArray = NULL; + jboolean *persistArray = NULL; + jlong *thresholdArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -466,7 +466,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1index(JNIEnv *env, jclass clss, jlong { jboolean isCopy; unsigned nindexes; /* Number of SOHM indexes */ - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -545,7 +545,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1phase_1change(JNIEnv *env, jclass clss jintArray size) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pGCPLImp.c b/java/src/jni/h5pGCPLImp.c index 2ba140d..e7d4dd2 100644 --- a/java/src/jni/h5pGCPLImp.c +++ b/java/src/jni/h5pGCPLImp.c @@ -142,7 +142,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1est_1link_1info(JNIEnv *env, jclass clss, jlong gcpl_id, jintArray link_info) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -200,7 +200,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1link_1phase_1change(JNIEnv *env, jclass clss, jlong gcpl_id, jintArray links) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c index 175794d..c12337c 100644 --- a/java/src/jni/h5pImp.c +++ b/java/src/jni/h5pImp.c @@ -232,7 +232,7 @@ Java_hdf_hdf5lib_H5_H5Pregister2(JNIEnv *env, jclass clss, jlong cls_id, jstring const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -279,7 +279,7 @@ Java_hdf_hdf5lib_H5_H5Pregister2_1nocb(JNIEnv *env, jclass clss, jlong cls_id, j const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -316,7 +316,7 @@ Java_hdf_hdf5lib_H5_H5Pinsert2(JNIEnv *env, jclass clss, jlong cls_id, jstring n const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -360,7 +360,7 @@ Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb(JNIEnv *env, jclass clss, jlong cls_id, jst const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -497,7 +497,7 @@ done: JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1class_1name(JNIEnv *env, jclass clss, jlong plid) { - char * c_str = NULL; + char *c_str = NULL; jstring j_str = NULL; UNUSED(clss); @@ -615,7 +615,7 @@ Java_hdf_hdf5lib_H5_H5Piterate(JNIEnv *env, jclass clss, jlong prop_id, jintArra { cb_wrapper wrapper = {callback_op, op_data}; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -754,7 +754,7 @@ static herr_t H5P_cls_create_cb(hid_t prop_id, void *create_data) { jmethodID mid; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cls; jint status = -1; @@ -784,7 +784,7 @@ static herr_t H5P_cls_copy_cb(hid_t new_prop_id, hid_t old_prop_id, void *copy_data) { jmethodID mid; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cls; jint status = -1; @@ -814,7 +814,7 @@ static herr_t H5P_cls_close_cb(hid_t prop_id, void *close_data) { jmethodID mid; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cls; jint status = -1; @@ -846,7 +846,7 @@ H5P_prp_create_cb(const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -879,7 +879,7 @@ H5P_prp_set_cb(hid_t prop_id, const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -912,7 +912,7 @@ H5P_prp_get_cb(hid_t prop_id, const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -945,7 +945,7 @@ H5P_prp_delete_cb(hid_t prop_id, const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -978,7 +978,7 @@ H5P_prp_copy_cb(const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -1010,7 +1010,7 @@ H5P_prp_compare_cb(void *value1, void *value2, size_t size) { jmethodID mid; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -1040,7 +1040,7 @@ H5P_prp_close_cb(const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -1075,8 +1075,8 @@ H5P_iterate_cb(hid_t prop_id, const char *name, void *cb_data) jobject visit_callback = wrapper->visit_callback; jstring str; jclass cls; - JNIEnv * cbenv = NULL; - void * op_data = (void *)wrapper->op_data; + JNIEnv *cbenv = NULL; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5pLAPLImp.c b/java/src/jni/h5pLAPLImp.c index 1db495c..81d99fa 100644 --- a/java/src/jni/h5pLAPLImp.c +++ b/java/src/jni/h5pLAPLImp.c @@ -117,7 +117,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1elink_1prefix(JNIEnv *env, jclass clss, jlong lapl_i { ssize_t prefix_size = -1; size_t size = 0; - char * pre = NULL; + char *pre = NULL; jstring str = NULL; UNUSED(clss); diff --git a/java/src/jni/h5pOCPLImp.c b/java/src/jni/h5pOCPLImp.c index bdcba46..e287962 100644 --- a/java/src/jni/h5pOCPLImp.c +++ b/java/src/jni/h5pOCPLImp.c @@ -141,7 +141,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1attr_1phase_1change(JNIEnv *env, jclass clss, jlong ocpl_id, jintArray attributes) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c index 9193028..2324402 100644 --- a/java/src/jni/h5plImp.c +++ b/java/src/jni/h5plImp.c @@ -205,7 +205,7 @@ Java_hdf_hdf5lib_H5_H5PLget(JNIEnv *env, jclass clss, jint idx) { jstring str = NULL; ssize_t buf_size; - char * aName = NULL; + char *aName = NULL; UNUSED(clss); diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c index 58b5522..527c801 100644 --- a/java/src/jni/h5rImp.c +++ b/java/src/jni/h5rImp.c @@ -38,7 +38,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1object(JNIEnv *env, jclass clss, jlong loc_id, js { const char *refName = NULL; jbyteArray ref = NULL; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -80,7 +80,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1region(JNIEnv *env, jclass clss, jlong loc_id, js { const char *refName = NULL; jbyteArray ref = NULL; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -124,7 +124,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1attr(JNIEnv *env, jclass clss, jlong loc_id, jstr const char *refName = NULL; const char *attrName = NULL; jbyteArray ref = NULL; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -171,7 +171,7 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Rdestroy(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; herr_t status = FAIL; @@ -204,7 +204,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rget_1type(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; H5R_type_t ref_type = -1; @@ -239,8 +239,8 @@ JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Requal(JNIEnv *env, jclass clss, jbyteArray ref1, jbyteArray ref2) { jboolean isCopy; - jbyte * refBuf1 = NULL; - jbyte * refBuf2 = NULL; + jbyte *refBuf1 = NULL; + jbyte *refBuf2 = NULL; jsize refBufLen; htri_t bval = JNI_FALSE; herr_t status = FAIL; @@ -291,10 +291,10 @@ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcopy(JNIEnv *env, jclass clss, jbyteArray src_ref) { jboolean isCopy; - jbyte * src_refBuf = NULL; + jbyte *src_refBuf = NULL; jsize refBufLen; jbyteArray dst_ref = NULL; - jbyte * dst_refBuf = NULL; + jbyte *dst_refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -339,7 +339,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1object(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -374,7 +374,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1region(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -409,7 +409,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1attr(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong aapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -445,7 +445,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3(JNIEnv *env, jclass clss, jbyteArray ref, { H5O_type_t object_info = -1; jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; int retVal = -1; UNUSED(clss); @@ -477,11 +477,11 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1file_1name(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jstring str = NULL; ssize_t buf_size; ssize_t check_size = -1; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -522,11 +522,11 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1obj_1name(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jstring str = NULL; ssize_t buf_size; ssize_t check_size = -1; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -568,11 +568,11 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1attr_1name(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jstring str = NULL; ssize_t buf_size; ssize_t check_size = -1; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -617,7 +617,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate(JNIEnv *env, jclass clss, jbyteArray ref, jlong lo { const char *refName = NULL; jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; herr_t status = FAIL; @@ -667,7 +667,7 @@ Java_hdf_hdf5lib_H5__1H5Rdereference(JNIEnv *env, jclass clss, jlong dataset, jl jint ref_type, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -711,7 +711,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Rget_1region(JNIEnv *env, jclass clss, jlong dataset, jint ref_type, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -753,7 +753,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type(JNIEnv *env, jclass clss, jlong loc_id, ji { H5O_type_t object_info; jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; int retVal = -1; UNUSED(clss); @@ -786,8 +786,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type2(JNIEnv *env, jclass clss, jlong loc_id, j jintArray ref_obj) { jboolean isCopy, isCopy2; - jbyte * refBuf = NULL; - jint * ref_objP = NULL; + jbyte *refBuf = NULL; + jint *ref_objP = NULL; jint status = -1; int retVal = -1; @@ -828,8 +828,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1name(JNIEnv *env, jclass clss, jlong loc_id, jint re jboolean isCopy; jstring str; jsize refBufLen; - jbyte * refBuf = NULL; - char * aName = NULL; + jbyte *refBuf = NULL; + char *aName = NULL; jlong ret_val = -1; UNUSED(clss); @@ -889,8 +889,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1name_1string(JNIEnv *env, jclass clss, jlong loc_id, jboolean isCopy; jstring str; jsize refBufLen; - jbyte * refBuf = NULL; - char * aName = NULL; + jbyte *refBuf = NULL; + char *aName = NULL; ssize_t buf_size = -1; jlong ret_val = -1; diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c index c3a8460..82fa3c7 100644 --- a/java/src/jni/h5sImp.c +++ b/java/src/jni/h5sImp.c @@ -63,8 +63,8 @@ Java_hdf_hdf5lib_H5__1H5Screate_1simple(JNIEnv *env, jclass clss, jint rank, jlo hsize_t *sa = NULL; hsize_t *msa = NULL; hsize_t *lp = NULL; - jlong * dimsP = NULL, *maxdimsP = NULL; - jlong * jlp = NULL; + jlong *dimsP = NULL, *maxdimsP = NULL; + jlong *jlp = NULL; jsize drank = 0, mrank = 0; int i; hid_t retVal = H5I_INVALID_HID; @@ -180,7 +180,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *env, jclass clss, jlong space_id { jboolean isCopy; hssize_t *sa = NULL; - jlong * P = NULL; + jlong *P = NULL; jint i; int rank; herr_t status = FAIL; @@ -224,8 +224,8 @@ Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *env, jclass clss, jlong space_id jboolean isCopy; hsize_t *lp = NULL; hsize_t *llp = NULL; - jlong * jlp = NULL; - jbyte * P = NULL; + jlong *jlp = NULL; + jbyte *P = NULL; jsize size; int ii; int nlongs; @@ -416,7 +416,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims(JNIEnv *env, jclass clss, jlong jboolean isCopy; hsize_t *sa = NULL; hsize_t *msa = NULL; - jlong * dimsP = NULL, *maxdimsP = NULL; + jlong *dimsP = NULL, *maxdimsP = NULL; int i; int rank = -1; int mrank; @@ -525,8 +525,8 @@ Java_hdf_hdf5lib_H5_H5Sset_1extent_1simple(JNIEnv *env, jclass clss, jlong space hsize_t *sa = NULL; hsize_t *msa = NULL; hsize_t *lp = NULL; - jlong * dimsP = NULL, *maxdimsP = NULL; - jlong * jlp = NULL; + jlong *dimsP = NULL, *maxdimsP = NULL; + jlong *jlp = NULL; jsize drank, mrank; int i; herr_t status = FAIL; @@ -635,8 +635,8 @@ Java_hdf_hdf5lib_H5_H5Soffset_1simple(JNIEnv *env, jclass clss, jlong space_id, hssize_t *lp = NULL; size_t rank; jsize i; - jbyte * P = NULL; - jlong * jlp = NULL; + jbyte *P = NULL; + jlong *jlp = NULL; herr_t status = FAIL; UNUSED(clss); @@ -749,8 +749,8 @@ Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab(JNIEnv *env, jclass clss, jlong space_i jboolean isCopy; hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL; hsize_t *lp = NULL; - jlong * startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; - jlong * jlp = NULL; + jlong *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; + jlong *jlp = NULL; jsize start_rank, stride_rank, count_rank, block_rank; int i; herr_t status = FAIL; @@ -944,7 +944,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1blocklist(JNIEnv *env, jclass clss, j jboolean isCopy; hsize_t *ba = NULL; size_t i, buf_size; - jlong * bufP = NULL; + jlong *bufP = NULL; jsize buflen; int rank; herr_t status = FAIL; @@ -1005,7 +1005,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1pointlist(JNIEnv *env, jclass clss, jl { jboolean isCopy; hsize_t *ba = NULL; - jlong * bufP = NULL; + jlong *bufP = NULL; jsize buflen; int i, rank; herr_t status = FAIL; @@ -1064,7 +1064,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1bounds(JNIEnv *env, jclass clss, jlong space hsize_t *strt = NULL; hsize_t *en = NULL; size_t i; - jlong * startP = NULL, *endP = NULL; + jlong *startP = NULL, *endP = NULL; jsize rank; herr_t status = FAIL; @@ -1163,7 +1163,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Sdecode(JNIEnv *env, jclass clss, jbyteArray buf) { jboolean isCopy; - jbyte * bufP = NULL; + jbyte *bufP = NULL; hid_t sid = H5I_INVALID_HID; UNUSED(clss); @@ -1215,7 +1215,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab(JNIEnv *env, jclass clss, jlong s { jboolean isCopy; hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL; - jlong * startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; + jlong *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; jsize start_rank = -1, stride_rank = -1, count_rank = -1, block_rank = -1; int i, rank = -1; herr_t status = FAIL; @@ -1390,7 +1390,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1adjust(JNIEnv *env, jclass clss, jlong space_id, { jboolean isCopy; hssize_t *offst = NULL; - jlong * offsetP = NULL; + jlong *offsetP = NULL; jsize offset_rank = -1; int i, rank = -1; herr_t status = FAIL; @@ -1450,7 +1450,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1intersect_1block(JNIEnv *env, jclass clss, jlong htri_t bval = JNI_FALSE; jboolean isCopy; hsize_t *strt = NULL, *nd = NULL; - jlong * startP = NULL, *endP = NULL; + jlong *startP = NULL, *endP = NULL; jsize start_rank = -1, end_rank = -1; int i, rank = -1; @@ -1558,8 +1558,8 @@ Java_hdf_hdf5lib_H5_H5Scombine_1hyperslab(JNIEnv *env, jclass clss, jlong space_ jboolean isCopy; hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL; hsize_t *lp = NULL; - jlong * startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; - jlong * jlp = NULL; + jlong *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; + jlong *jlp = NULL; jsize start_rank, stride_rank, count_rank, block_rank; int i; hid_t sid = H5I_INVALID_HID; diff --git a/java/src/jni/h5tImp.c b/java/src/jni/h5tImp.c index 8cd1afb..5a1d398 100644 --- a/java/src/jni/h5tImp.c +++ b/java/src/jni/h5tImp.c @@ -361,7 +361,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1pad(JNIEnv *env, jclass clss, jlong type_id, jintArray pad) { jboolean isCopy; - jint * P = NULL; + jint *P = NULL; herr_t status = FAIL; UNUSED(clss); @@ -448,7 +448,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1fields_1int(JNIEnv *env, jclass clss, jlong type_id, { jboolean isCopy; jsize arrLen; - jint * P = NULL; + jint *P = NULL; herr_t status = FAIL; UNUSED(clss); @@ -485,7 +485,7 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tget_1fields(JNIEnv *env, jclass clss, jlong type_id, jlongArray fields) { jboolean isCopy; - jlong * fieldsArray = NULL; + jlong *fieldsArray = NULL; jsize arrLen; herr_t status = FAIL; @@ -792,7 +792,7 @@ done: JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1name(JNIEnv *env, jclass clss, jlong type_id, jint field_idx) { - char * member_name = NULL; + char *member_name = NULL; jstring str = NULL; UNUSED(clss); @@ -949,7 +949,7 @@ Java_hdf_hdf5lib_H5_H5Treclaim(JNIEnv *env, jclass clss, jlong type_id, jlong sp jbyteArray buf) { jboolean bufIsCopy; - jbyte * pinBuf = NULL; + jbyte *pinBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1042,7 +1042,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Tget_1tag(JNIEnv *env, jclass clss, jlong type) { jstring str = NULL; - char * tag = NULL; + char *tag = NULL; UNUSED(clss); @@ -1108,7 +1108,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1insert_1int(JNIEnv *env, jclass clss, jlong type_id { const char *memberName = NULL; jboolean isCopy; - jint * intBuf = NULL; + jint *intBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1144,7 +1144,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1insert(JNIEnv *env, jclass clss, jlong type_id, jst { const char *memberName = NULL; jboolean isCopy; - jbyte * memberBuf = NULL; + jbyte *memberBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1179,8 +1179,8 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int(JNIEnv *env, jclass clss, jlong type_id { jboolean isCopy; jstring str; - jint * intP = NULL; - char * nameP = NULL; + jint *intP = NULL; + char *nameP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1224,8 +1224,8 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof(JNIEnv *env, jclass clss, jlong type_id, jby { jboolean isCopy; jstring str = NULL; - jbyte * byteP = NULL; - char * nameP = NULL; + jbyte *byteP = NULL; + char *nameP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1267,7 +1267,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1valueof_1int(JNIEnv *env, jclass clss, jlong type_i { const char *enumValue = NULL; jboolean isCopy; - jint * enumValueBuf = NULL; + jint *enumValueBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1303,7 +1303,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1valueof(JNIEnv *env, jclass clss, jlong type_id, js { const char *enumValue = NULL; jboolean isCopy; - jbyte * enumValueBuf = NULL; + jbyte *enumValueBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1337,7 +1337,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1member_1value_1int(JNIEnv *env, jclass clss, jlong t jintArray value) { jboolean isCopy; - jint * intP = NULL; + jint *intP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1367,7 +1367,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1member_1value(JNIEnv *env, jclass clss, jlong type_i jbyteArray value) { jboolean isCopy; - jbyte * byteP = NULL; + jbyte *byteP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1417,7 +1417,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims(JNIEnv *env, jclass clss, jlong type_id, hsize_t *cdims = NULL; size_t i; jsize dlen; - jint * dimsP = NULL; + jint *dimsP = NULL; int ndims = -1; UNUSED(clss); @@ -1552,7 +1552,7 @@ Java_hdf_hdf5lib_H5__1H5Tarray_1create2(JNIEnv *env, jclass clss, jlong base_id, jboolean isCopy; hsize_t *cdims = NULL; size_t i; - jlong * dimsP = NULL; + jlong *dimsP = NULL; jsize dlen; hid_t retVal = H5I_INVALID_HID; @@ -1603,7 +1603,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2(JNIEnv *env, jclass clss, jlong type_id jboolean isCopy; hsize_t *cdims = NULL; size_t i; - jlong * dimsP = NULL; + jlong *dimsP = NULL; jsize dlen; int ndims = -1; @@ -1648,8 +1648,8 @@ Java_hdf_hdf5lib_H5_H5Tconvert(JNIEnv *env, jclass clss, jlong src_id, jlong dst jbyteArray buf, jbyteArray background, jlong plist_id) { jboolean isCopy; - jbyte * bufP = NULL; - jbyte * bgP = NULL; + jbyte *bufP = NULL; + jbyte *bgP = NULL; herr_t status = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c index d661acb..31eb320 100644 --- a/java/src/jni/h5util.c +++ b/java/src/jni/h5util.c @@ -46,7 +46,7 @@ jobject set_callback; jobject delete_callback; H5E_auto2_t efunc; -void * edata; +void *edata; /********************/ /* Local Prototypes */ @@ -190,9 +190,9 @@ h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_ size_t retVal = 0; size_t typeSize = 0; hid_t mtid = H5I_INVALID_HID; - char * this_str = NULL; - char * cptr = NULL; - char * token; + char *this_str = NULL; + char *cptr = NULL; + char *token; int n; if (!in_str) @@ -680,7 +680,7 @@ int h5str_sprint_reference(JNIEnv *env, h5str_t *out_str, void *ref_p) { ssize_t buf_size; - char * ref_name = NULL; + char *ref_name = NULL; H5R_ref_t *ref_vp = (H5R_ref_t *)ref_p; int ret_value = FAIL; @@ -833,8 +833,8 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i size_t typeSize = 0; H5T_sign_t nsign = H5T_SGN_ERROR; hid_t mtid = H5I_INVALID_HID; - char * cptr = (char *)in_buf; - char * this_str = NULL; + char *cptr = (char *)in_buf; + char *this_str = NULL; int n; size_t retVal = 0; @@ -916,7 +916,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i case H5T_STRING: { htri_t is_variable; - char * tmp_str; + char *tmp_str; typeSize = 0; @@ -1182,7 +1182,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i else if (H5R_OBJ_REF_BUF_SIZE == typeSize) { H5O_info2_t oi; hid_t obj = H5I_INVALID_HID; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; /* * Object references -- show the type and OID of the referenced @@ -1262,7 +1262,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i /* Object references -- show the type and * OID of the referenced object. */ H5O_info2_t oi; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; if ((new_obj_id = H5Ropen_object(ref_vp, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { H5Oget_info3(new_obj_id, &oi, H5O_INFO_BASIC); @@ -1435,7 +1435,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i case H5T_VLEN: { unsigned int i; size_t baseSize; - hvl_t * vl_buf = (hvl_t *)in_buf; + hvl_t *vl_buf = (hvl_t *)in_buf; if ((mtid = H5Tget_super(tid)) < 0) H5_LIBRARY_ERROR(ENVONLY); @@ -1541,7 +1541,7 @@ h5str_print_region_data_blocks(JNIEnv *env, hid_t region_id, h5str_t *str, int n size_t type_size; hid_t mem_space = H5I_INVALID_HID; hid_t sid1 = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int ret_value = FAIL; if (ndims < 0) @@ -1753,7 +1753,7 @@ h5str_print_region_data_points(JNIEnv *env, hid_t region_space, hid_t region_id, size_t jndx; size_t type_size; hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int ret_value = FAIL; UNUSED(ptdata); @@ -2276,7 +2276,7 @@ h5str_render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hs unsigned char tempuchar; unsigned int i; H5T_str_t pad; - char * s; + char *s; if ((pad = H5Tget_strpad(tid)) < 0) { ret_value = FAIL; @@ -2492,7 +2492,7 @@ render_bin_output_region_data_blocks(FILE *stream, hid_t region_id, hid_t contai size_t type_size; hid_t sid1 = H5I_INVALID_HID; hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int blkndx; int jndx; int ret_value = SUCCEED; @@ -2681,7 +2681,7 @@ render_bin_output_region_data_points(FILE *stream, hid_t region_space, hid_t reg hsize_t *dims1 = NULL; size_t type_size; hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int ret_value = SUCCEED; UNUSED(ptdata); @@ -2878,7 +2878,7 @@ h5str_dump_region_attribute(JNIEnv *env, h5str_t *str, hid_t region_id) for (i = 0; i < p_nelmts; i++) { size_t bytes_in = 0; /* # of bytes to write */ - void * memref = buf + i * size; + void *memref = buf + i * size; if (!(bytes_in = h5str_sprintf(ENVONLY, str, region_id, type_id, memref, 1))) CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE); @@ -2928,7 +2928,7 @@ h5str_dump_simple_dset(JNIEnv *env, FILE *stream, hid_t dset, int binary_order) size_t p_type_nbytes; /* size of memory type */ /* Stripmine info */ - void * sm_buf = NULL; /* buffer for raw data */ + void *sm_buf = NULL; /* buffer for raw data */ hsize_t sm_size[H5S_MAX_RANK]; /* stripmine size */ hsize_t sm_nbytes; /* bytes per stripmine */ hsize_t sm_nelmts; /* elements per stripmine */ @@ -3147,7 +3147,7 @@ h5str_dump_simple_mem(JNIEnv *env, FILE *stream, hid_t attr_id, int binary_order hsize_t total_size[H5S_MAX_RANK]; /* total size of dataset*/ hsize_t p_nelmts; /* total selected elmts */ - void * sm_buf = NULL; /* buffer for raw data */ + void *sm_buf = NULL; /* buffer for raw data */ hsize_t sm_size[H5S_MAX_RANK]; /* stripmine size */ int ret_value = 0; @@ -3355,7 +3355,7 @@ h5str_dump_simple_data(JNIEnv *env, FILE *stream, hid_t container, hid_t type, v for (i = 0, line_count = 0; i < nelmts; i++, line_count++) { size_t bytes_in = 0; /* # of bytes to write */ - void * memref = mem + i * size; + void *memref = mem + i * size; /* Render the data element*/ h5str_new(&buffer, 32 * size); @@ -3413,7 +3413,7 @@ Java_hdf_hdf5lib_H5_H5AreadComplex(JNIEnv *env, jclass clss, jlong attr_id, jlon size_t i; hid_t p_type = H5I_INVALID_HID; jsize n; - char * readBuf = NULL; + char *readBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -3480,7 +3480,7 @@ Java_hdf_hdf5lib_H5_H5Acopy(JNIEnv *env, jclass clss, jlong src_id, jlong dst_id hssize_t npoints; hsize_t total_size = 0; size_t type_size; - jbyte * buf = NULL; + jbyte *buf = NULL; hid_t tid = H5I_INVALID_HID; hid_t sid = H5I_INVALID_HID; herr_t retVal = FAIL; @@ -3538,7 +3538,7 @@ Java_hdf_hdf5lib_H5_H5Dcopy(JNIEnv *env, jclass clss, jlong src_id, jlong dst_id hssize_t npoints; hsize_t total_size = 0, total_allocated_size; size_t type_size; - jbyte * buf = NULL; + jbyte *buf = NULL; hid_t tid = H5I_INVALID_HID; hid_t sid = H5I_INVALID_HID; herr_t retVal = FAIL; @@ -3613,10 +3613,10 @@ static int H5Gget_obj_info_full(hid_t loc_id, char **objname, int *otype, int #endif typedef struct info_all { - char ** objname; - int * otype; - int * ltype; - H5O_token_t * obj_token; + char **objname; + int *otype; + int *ltype; + H5O_token_t *obj_token; unsigned long *fno; unsigned long idxnum; int count; @@ -3639,15 +3639,15 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full(JNIEnv *env, jclass clss, jlong loc_ jint indx_order) { unsigned long *fnos = NULL; - H5O_token_t * tokens = NULL; - const char * gName = NULL; - char ** oName = NULL; + H5O_token_t *tokens = NULL; + const char *gName = NULL; + char **oName = NULL; jboolean isCopy; jstring str; jobject token; - jint * otarr = NULL; - jint * ltarr = NULL; - jlong * fnoP = NULL; + jint *otarr = NULL; + jint *ltarr = NULL; + jlong *fnoP = NULL; hid_t gid = (hid_t)loc_id; int i; int indexType = indx_type; @@ -3753,9 +3753,9 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max(JNIEnv *env, jclass clss, jlong loc_i jboolean isCopy; jstring str; jobject token; - char ** oName = NULL; - jint * otarr = NULL; - jint * ltarr = NULL; + char **oName = NULL; + jint *otarr = NULL; + jint *ltarr = NULL; int i; herr_t ret_val = FAIL; @@ -3947,7 +3947,7 @@ Java_hdf_hdf5lib_H5_H5export_1dataset(JNIEnv *env, jclass clss, jstring file_exp jboolean isCopy; herr_t ret_val = FAIL; hid_t dataset_id = H5I_INVALID_HID; - FILE * stream = NULL; + FILE *stream = NULL; UNUSED(clss); @@ -4001,7 +4001,7 @@ Java_hdf_hdf5lib_H5_H5export_1attribute(JNIEnv *env, jclass clss, jstring file_e jboolean isCopy; herr_t ret_val = FAIL; hid_t attr_id = H5I_INVALID_HID; - FILE * stream = NULL; + FILE *stream = NULL; UNUSED(clss); diff --git a/java/src/jni/h5util.h b/java/src/jni/h5util.h index 3146c06..24c1116 100644 --- a/java/src/jni/h5util.h +++ b/java/src/jni/h5util.h @@ -31,14 +31,14 @@ #endif typedef struct h5str_t { - char * s; + char *s; size_t max; /* the allocated size of the string */ } h5str_t; extern void h5str_new(h5str_t *str, size_t len); extern void h5str_free(h5str_t *str); extern void h5str_resize(h5str_t *str, size_t new_len); -extern char * h5str_append(h5str_t *str, const char *cstr); +extern char *h5str_append(h5str_t *str, const char *cstr); extern htri_t h5str_detect_vlen(hid_t tid); extern size_t h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_buf, size_t out_buf_offset); diff --git a/java/src/jni/h5vlImp.c b/java/src/jni/h5vlImp.c index 40f8863..770fc45 100644 --- a/java/src/jni/h5vlImp.c +++ b/java/src/jni/h5vlImp.c @@ -211,7 +211,7 @@ JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5VLget_1connector_1name(JNIEnv *env, jclass clss, jlong object_id) { ssize_t buf_size, status; - char * volName = NULL; + char *volName = NULL; jstring str = NULL; UNUSED(clss); diff --git a/java/src/jni/nativeData.c b/java/src/jni/nativeData.c index ac9168b..8bcfac1 100644 --- a/java/src/jni/nativeData.c +++ b/java/src/jni/nativeData.c @@ -50,10 +50,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToInt___3B(JNIEnv *env, jclass clss, jbyteArr { jintArray rarray = NULL; jboolean bb; - jbyte * barr = NULL; - jint * iarray = NULL; - jint * iap = NULL; - char * bp = NULL; + jbyte *barr = NULL; + jint *iarray = NULL; + jint *iap = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -101,10 +101,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToFloat___3B(JNIEnv *env, jclass clss, { jfloatArray rarray = NULL; jboolean bb; - jfloat * farray = NULL; - jfloat * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jfloat *farray = NULL; + jfloat *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -152,10 +152,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToShort___3B(JNIEnv *env, jclass clss, { jshortArray rarray = NULL; jboolean bb; - jshort * sarray = NULL; - jshort * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jshort *sarray = NULL; + jshort *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -203,10 +203,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToLong___3B(JNIEnv *env, jclass clss, { jlongArray rarray = NULL; jboolean bb; - jlong * larray = NULL; - jlong * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jlong *larray = NULL; + jlong *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -254,10 +254,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToDouble___3B(JNIEnv *env, jclass clss, { jdoubleArray rarray = NULL; jboolean bb; - jdouble * darray = NULL; - jdouble * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jdouble *darray = NULL; + jdouble *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -305,10 +305,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToInt__II_3B(JNIEnv *env, jclass clss, jint s { jintArray rarray = NULL; jboolean bb; - jint * iarray = NULL; - jint * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jint *iarray = NULL; + jint *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -357,10 +357,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToShort__II_3B(JNIEnv *env, jclass clss, jint { jshortArray rarray = NULL; jboolean bb; - jshort * sarray = NULL; - jshort * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jshort *sarray = NULL; + jshort *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -409,10 +409,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToFloat__II_3B(JNIEnv *env, jclass clss, jint { jfloatArray rarray = NULL; jboolean bb; - jfloat * farray = NULL; - jfloat * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jfloat *farray = NULL; + jfloat *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -461,10 +461,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToLong__II_3B(JNIEnv *env, jclass clss, jint { jlongArray rarray = NULL; jboolean bb; - jlong * larray = NULL; - jlong * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jlong *larray = NULL; + jlong *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -513,10 +513,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToDouble__II_3B(JNIEnv *env, jclass clss, jin { jdoubleArray rarray = NULL; jboolean bb; - jdouble * darray = NULL; - jdouble * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jdouble *darray = NULL; + jdouble *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -565,10 +565,10 @@ Java_hdf_hdf5lib_HDFNativeData_intToByte__II_3I(JNIEnv *env, jclass clss, jint s { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; - jint * ip = NULL; - jint * iarr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; + jint *ip = NULL; + jint *iarr = NULL; int ilen; int blen; int ii; @@ -627,10 +627,10 @@ Java_hdf_hdf5lib_HDFNativeData_shortToByte__II_3S(JNIEnv *env, jclass clss, jint { jbyteArray rarray = NULL; jboolean bb; - jshort * ip = NULL; - jshort * sarr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jshort *ip = NULL; + jshort *sarr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -689,10 +689,10 @@ Java_hdf_hdf5lib_HDFNativeData_floatToByte__II_3F(JNIEnv *env, jclass clss, jint { jbyteArray rarray = NULL; jboolean bb; - jfloat * ip = NULL; - jfloat * farr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jfloat *ip = NULL; + jfloat *farr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -751,10 +751,10 @@ Java_hdf_hdf5lib_HDFNativeData_doubleToByte__II_3D(JNIEnv *env, jclass clss, jin { jbyteArray rarray = NULL; jboolean bb; - jdouble * ip = NULL; - jdouble * darr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jdouble *ip = NULL; + jdouble *darr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -813,10 +813,10 @@ Java_hdf_hdf5lib_HDFNativeData_longToByte__II_3J(JNIEnv *env, jclass clss, jint { jbyteArray rarray = NULL; jboolean bb; - jlong * ip = NULL; - jlong * larr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jlong *ip = NULL; + jlong *larr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -874,8 +874,8 @@ Java_hdf_hdf5lib_HDFNativeData_intToByte__I(JNIEnv *env, jclass clss, jint idata { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { int ival; @@ -909,8 +909,8 @@ Java_hdf_hdf5lib_HDFNativeData_floatToByte__F(JNIEnv *env, jclass clss, jfloat f { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { float ival; @@ -944,8 +944,8 @@ Java_hdf_hdf5lib_HDFNativeData_shortToByte__S(JNIEnv *env, jclass clss, jshort s { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { short ival; @@ -979,8 +979,8 @@ Java_hdf_hdf5lib_HDFNativeData_doubleToByte__D(JNIEnv *env, jclass clss, jdouble { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { double ival; @@ -1014,8 +1014,8 @@ Java_hdf_hdf5lib_HDFNativeData_longToByte__J(JNIEnv *env, jclass clss, jlong lda { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { jlong ival; @@ -1049,8 +1049,8 @@ Java_hdf_hdf5lib_HDFNativeData_byteToByte__B(JNIEnv *env, jclass clss, jbyte bda { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { jbyte ival; diff --git a/java/test/TestH5.java b/java/test/TestH5.java index 67a522c..722ab65 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -107,7 +107,7 @@ public class TestH5 { { try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5did = _createDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT); } diff --git a/java/test/TestH5A.java b/java/test/TestH5A.java index 96ce5b5..4437ec7 100644 --- a/java/test/TestH5A.java +++ b/java/test/TestH5A.java @@ -547,7 +547,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate(H5did, "dset", type_id, space_id, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); attribute_id = H5.H5Aopen(H5did, "dset", HDF5Constants.H5P_DEFAULT); // Calling H5Aget_info with attribute_id returned from H5Aopen. attr_info = H5.H5Aget_info(attribute_id); @@ -588,7 +588,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate(H5did, ".", type_id, space_id, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); attribute_id = H5.H5Aopen_by_idx(H5did, ".", HDF5Constants.H5_INDEX_CRT_ORDER, order, 0, HDF5Constants.H5P_DEFAULT, lapl_id); // Calling H5Aget_info with attribute_id returned from @@ -631,7 +631,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate(H5did, "dset1", type_id, space_id, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); attr2_id = H5.H5Acreate(H5did, "dataset2", type_id, space_id, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT); @@ -708,7 +708,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate_by_name(H5fid, obj_name, attr_name, type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr_info = H5.H5Aget_info_by_name(H5fid, obj_name, attr_name, lapl_id); assertNotNull(attr_info); } @@ -1221,13 +1221,13 @@ public class TestH5A { } try { attr1_id = H5.H5Acreate_by_name(H5fid, ".", "attribute1", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr2_id = H5.H5Acreate_by_name(H5fid, ".", "attribute2", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr3_id = H5.H5Acreate_by_name(H5fid, ".", "attribute3", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr4_id = H5.H5Acreate_by_name(H5fid, ".", "attribute4", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); H5A_iterate_cb iter_cb = new H5A_iter_callback(); try { H5.H5Aiterate(H5fid, HDF5Constants.H5_INDEX_CRT_ORDER, HDF5Constants.H5_ITER_INC, 0L, iter_cb, @@ -1314,13 +1314,13 @@ public class TestH5A { } try { attr1_id = H5.H5Acreate_by_name(H5fid, ".", "attribute4", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr2_id = H5.H5Acreate_by_name(H5fid, ".", "attribute3", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr3_id = H5.H5Acreate_by_name(H5fid, ".", "attribute2", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr4_id = H5.H5Acreate_by_name(H5fid, ".", "attribute1", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); H5A_iterate_cb iter_cb = new H5A_iter_callback(); try { H5.H5Aiterate_by_name(H5fid, ".", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 0L, diff --git a/java/test/TestH5Dplist.java b/java/test/TestH5Dplist.java index b9e97f4..c3e4d69 100644 --- a/java/test/TestH5Dplist.java +++ b/java/test/TestH5Dplist.java @@ -125,7 +125,7 @@ public class TestH5Dplist { System.out.print(testname.getMethodName()); try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(RANK, H5dims, H5maxdims); } catch (Throwable err) { diff --git a/java/test/TestH5Ocopy.java b/java/test/TestH5Ocopy.java index e429fef..18cb71a 100644 --- a/java/test/TestH5Ocopy.java +++ b/java/test/TestH5Ocopy.java @@ -98,7 +98,7 @@ public class TestH5Ocopy { System.out.print(testname.getMethodName()); try { H5fid = H5.H5Fcreate(FILENAME, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid2 = H5.H5Screate(HDF5Constants.H5S_SCALAR); H5did1 = _createDataset(H5fid, H5dsid2, "DS2", HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(1, dims, null); diff --git a/java/test/TestH5OcopyOld.java b/java/test/TestH5OcopyOld.java index 2cfccc7..6353df5 100644 --- a/java/test/TestH5OcopyOld.java +++ b/java/test/TestH5OcopyOld.java @@ -98,7 +98,7 @@ public class TestH5OcopyOld { System.out.print(testname.getMethodName()); try { H5fid = H5.H5Fcreate(FILENAME, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid2 = H5.H5Screate(HDF5Constants.H5S_SCALAR); H5did1 = _createDataset(H5fid, H5dsid2, "DS2", HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(1, dims, null); diff --git a/java/test/TestH5PData.java b/java/test/TestH5PData.java index 49a0b7d..da45715 100644 --- a/java/test/TestH5PData.java +++ b/java/test/TestH5PData.java @@ -104,7 +104,7 @@ public class TestH5PData { try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5did = _createFloatDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT); plist_id = H5.H5Pcreate(HDF5Constants.H5P_DATASET_XFER); diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java index 307ee74..e5c04ee 100644 --- a/java/test/TestH5Pfapl.java +++ b/java/test/TestH5Pfapl.java @@ -247,7 +247,7 @@ public class TestH5Pfapl { { try { H5fid = H5.H5Fcreate(H5_FAMILY_FILE + ".h5", HDF5Constants.H5F_ACC_TRUNC, - HDF5Constants.H5P_DEFAULT, fapl); + HDF5Constants.H5P_DEFAULT, fapl); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5did = _createDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT); } diff --git a/java/test/TestH5Pvirtual.java b/java/test/TestH5Pvirtual.java index 41ae6d1..b743f09 100644 --- a/java/test/TestH5Pvirtual.java +++ b/java/test/TestH5Pvirtual.java @@ -107,11 +107,11 @@ public class TestH5Pvirtual { try { file_id = H5.H5Fcreate(SRC_FILE[i], HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); space_id = H5.H5Screate_simple(1, H5dims, null); dset_id = H5.H5Dcreate(file_id, SRC_DATASET[i], HDF5Constants.H5T_NATIVE_INT, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, + HDF5Constants.H5P_DEFAULT); H5.H5Dwrite(dset_id, HDF5Constants.H5T_NATIVE_INT, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, HDF5Constants.H5P_DEFAULT, dset_data); } @@ -144,7 +144,7 @@ public class TestH5Pvirtual { try { int[] fill_value = {-1}; H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, VDSH5dims, null); H5dcplid = H5.H5Pcreate(HDF5Constants.H5P_DATASET_CREATE); H5.H5Pset_fill_value(H5dcplid, HDF5Constants.H5T_NATIVE_INT, fill_value); diff --git a/java/test/TestH5R.java b/java/test/TestH5R.java index dd8634b..221a71e 100644 --- a/java/test/TestH5R.java +++ b/java/test/TestH5R.java @@ -111,7 +111,7 @@ public class TestH5R { try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5gid = _createGroup(H5fid, "Group1"); H5did2 = _createDataset(H5gid, H5dsid, "dset2", HDF5Constants.H5P_DEFAULT); |