6 files changed, 38 insertions, 13 deletions
diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index cd1c2f0..d4511e1 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -24,6 +24,7 @@ extern "C" {
 #include <jni.h>
 #include "hdf5.h"
 
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
 
 JNIEXPORT jlong JNICALL
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index bf2d7b1..ac71845 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -457,7 +457,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx
         } /* end if */
         else {
             buf_size = infobuf.u.val_size;
-            if(buf_size < 0) {
+            if(buf_size == 0) {
                 h5libraryError(env);
             } /* end if */
             else {
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index df8b3c9..dcfcd82 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -5127,8 +5127,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
         else {
             /* get the length of the filename */
             H5Pget_mdc_log_options((hid_t)fapl_id, &is_enabled, NULL, &location_size, &start_on_access);
-            if (location_size < 0) {
-                h5badArgument(env, "H5Pget_mdc_log_options:  location_size < 0");
+            if (location_size == 0) {
+                h5badArgument(env, "H5Pget_mdc_log_options:  location_size is 0");
             }/* end if */
             else if (location_size > 0) {
                 location_size++; /* add extra space for the null terminator */
diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c
index f064634..ffd5b7a 100644
--- a/java/src/jni/h5plImp.c
+++ b/java/src/jni/h5plImp.c
@@ -68,7 +68,7 @@ JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5PLappend
   (JNIEnv *env, jclass clss, jobjectArray plugin_path)
 {
-    char *aName;
+    const char *aName;
     herr_t retVal = -1;
 
     PIN_JAVA_STRING(plugin_path, aName);
@@ -90,7 +90,7 @@ JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5PLprepend
   (JNIEnv *env, jclass clss, jobjectArray plugin_path)
 {
-    char *aName;
+    const char *aName;
     herr_t retVal = -1;
 
     PIN_JAVA_STRING(plugin_path, aName);
@@ -113,7 +113,7 @@ JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5PLreplace
   (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint index)
 {
-    char *aName;
+    const char *aName;
     herr_t retVal = -1;
 
     PIN_JAVA_STRING(plugin_path, aName);
@@ -136,7 +136,7 @@ JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5PLinsert
   (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint index)
 {
-    char *aName;
+    const char *aName;
     herr_t retVal = -1;
 
     PIN_JAVA_STRING(plugin_path, aName);
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index c578ab8..10f69eb 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -1206,8 +1206,8 @@ Java_hdf_hdf5lib_H5_H5Sencode
         if (status < 0) {
             h5libraryError(env);
         } /* end else if */
-        else if (buf_size < 0) {
-            h5badArgument(env, "H5Sencode:  buf_size < 0");
+        else if (buf_size == 0) {
+            h5badArgument(env, "H5Sencode:  buf_size = 0");
         } /* end if */
         else {
             bufPtr = (unsigned char*)HDcalloc((size_t) 1, buf_size);
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 8454815..bd9fc0f 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -350,7 +350,7 @@ h5str_sprintf
             this_str = (char*)HDmalloc(4 * (nll + 1));
 
             if (1 == nll) {
-                sprintf(this_str, "0x%02x", ucptr[0]);
+                sprintf(this_str, "%#02x", ucptr[0]);
             }
             else {
                 for (i = 0; i < (int)nll; i++)
@@ -481,7 +481,7 @@ h5str_sprintf
         this_str = (char*)HDmalloc(4 * (nll + 1));
 
         if (1 == nll) {
-            sprintf(this_str, "0x%02x", ucptr[0]);
+            sprintf(this_str, "%#02x", ucptr[0]);
         }
         else {
             for (i = 0; i < (int)nll; i++)
@@ -1051,8 +1051,20 @@ h5str_get_little_endian_type
             p_type=H5Tcopy(H5T_IEEE_F64LE);
         break;
 
-    case H5T_TIME:
     case H5T_BITFIELD:
+    {
+        if ( size == 1)
+            p_type=H5Tcopy(H5T_STD_B8LE);
+        else if ( size == 2)
+            p_type=H5Tcopy(H5T_STD_B16LE);
+        else if ( size == 4)
+            p_type=H5Tcopy(H5T_STD_B32LE);
+        else if ( size == 8)
+            p_type=H5Tcopy(H5T_STD_B64LE);
+    }
+    break;
+
+    case H5T_TIME:
     case H5T_OPAQUE:
     case H5T_STRING:
     case H5T_COMPOUND:
@@ -1122,8 +1134,20 @@ h5str_get_big_endian_type
             p_type=H5Tcopy(H5T_IEEE_F64BE);
         break;
 
-    case H5T_TIME:
     case H5T_BITFIELD:
+    {
+        if ( size == 1)
+            p_type=H5Tcopy(H5T_STD_B8BE);
+        else if ( size == 2)
+            p_type=H5Tcopy(H5T_STD_B16BE);
+        else if ( size == 4)
+            p_type=H5Tcopy(H5T_STD_B32BE);
+        else if ( size == 8)
+            p_type=H5Tcopy(H5T_STD_B64BE);
+    }
+    break;
+
+    case H5T_TIME:
     case H5T_OPAQUE:
     case H5T_STRING:
     case H5T_COMPOUND: