Commit d028d612 authored by brinn's avatar brinn

Update to HDF5 1.10.5, part 2.

parent 7dca4253
diff -ruN hdf5-1.10.4.sv/java/src/jni/h5dImp.c hdf5-1.10.4/java/src/jni/h5dImp.c
--- hdf5-1.10.4.sv/java/src/jni/h5dImp.c 2018-09-10 16:43:41.000000000 +0200
+++ hdf5-1.10.4/java/src/jni/h5dImp.c 2018-10-20 22:55:44.073210246 +0200
@@ -299,21 +299,7 @@
if (buf == NULL) {
h5nullArgument(env, "H5Dread: buf is NULL");
} /* end if */
- else if((data_class = H5Tdetect_class(mem_type_id, H5T_VLEN)) < 0) {
- h5JNIFatalError(env, "H5Dread: H5Tdetect_class() failed");
- } /* end else if */
- else if(data_class == 1) {
- h5badArgument(env, "H5Dread: buf does not support variable length type");
- } /* end else if */
else {
- /* recursive detect any vlen string in type (compound, array ...) */
- if((data_class = H5Tdetect_variable_str(mem_type_id)) < 0) {
- h5JNIFatalError(env, "H5Dread: H5Tdetect_variable_str() failed");
- } /* end if */
- else if(data_class == 1) {
- h5badArgument(env, "H5Dread: buf does not support variable length type");
- } /* end else if */
- else {
PIN_BYTE_ARRAY();
if (buffP == NULL) {
@@ -331,7 +317,6 @@
UNPIN_BYTE_ARRAY(0); /* update java buffer for return */
} /* end else */
} /* end else */
- } /* end else */
} /* end else */
return (jint)status;
@@ -355,21 +340,7 @@
if (buf == NULL) {
h5nullArgument(env, "H5Dwrite: buf is NULL");
} /* end if */
- else if((data_class = H5Tdetect_class(mem_type_id, H5T_VLEN)) < 0) {
- h5JNIFatalError(env, "H5Dwrite: H5Tdetect_class() failed");
- } /* end else if */
- else if(data_class == 1) {
- h5badArgument(env, "H5Dwrite: buf does not support variable length type");
- } /* end else if */
else {
- /* recursive detect any vlen string in type (compound, array ...) */
- if((data_class = H5Tdetect_variable_str(mem_type_id)) < 0) {
- h5JNIFatalError(env, "H5Dwrite: H5Tdetect_variable_str() failed");
- } /* end if */
- else if(data_class == 1) {
- h5badArgument(env, "H5Dwrite: buf does not support variable length type");
- } /* end else if */
- else {
PIN_BYTE_ARRAY();
if (buffP == NULL) {
h5JNIFatalError(env, "H5Dwrite: buf not pinned");
@@ -383,7 +354,6 @@
if (status < 0)
h5libraryError(env);
} /* end else */
- } /* end else */
} /* end else */
return (jint)status;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment