Normalization of Java with develop (#1607)

3 files changed, 13 insertions, 13 deletions

diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java
index dea49dd..0a99fa4 100644
--- a/java/src/hdf/hdf5lib/HDF5Constants.java
+++ b/java/src/hdf/hdf5lib/HDF5Constants.java
@@ -158,15 +158,15 @@ public class HDF5Constants {
     public static final long H5E_ALREADYINIT = H5E_ALREADYINIT();
     /** Major error codes - Invalid arguments to routine */
     public static final long H5E_ARGS = H5E_ARGS();
-    /** Major error codes - Object atom */
+    /** Major error codes - Object ID */
     public static final long H5E_ATOM = H5E_ATOM();
     /** Major error codes - Attribute */
     public static final long H5E_ATTR = H5E_ATTR();
-    /** Minor error codes - Object atom related errors - Unable to find atom information (already closed?) */
+    /** Minor error codes - Object ID related errors - Unable to find ID information (already closed?) */
     public static final long H5E_BADATOM = H5E_BADATOM();
     /** Minor error codes - File accessibility errors - Bad file ID accessed */
     public static final long H5E_BADFILE = H5E_BADFILE();
-    /** Minor error codes - Object atom related errors - Unable to find ID group information */
+    /** Minor error codes - Object ID related errors - Unable to find ID group information */
     public static final long H5E_BADGROUP = H5E_BADGROUP();
     /** Minor error codes - Object header related errors - Iteration failed */
     public static final long H5E_BADITER = H5E_BADITER();
@@ -218,7 +218,7 @@ public class HDF5Constants {
     public static final long H5E_CANTCOUNT = H5E_CANTCOUNT();
     /** Minor error codes - File accessibility errors - Unable to create file */
     public static final long H5E_CANTCREATE = H5E_CANTCREATE();
-    /** Minor error codes - Object atom related errors - Unable to decrement reference count */
+    /** Minor error codes - Object ID related errors - Unable to decrement reference count */
     public static final long H5E_CANTDEC = H5E_CANTDEC();
     /** Minor error codes - B-tree related errors - Unable to decode value */
     public static final long H5E_CANTDECODE = H5E_CANTDECODE();
@@ -250,7 +250,7 @@ public class HDF5Constants {
     public static final long H5E_CANTGET = H5E_CANTGET();
     /** Minor error codes - Resource errors - Unable to compute size */
     public static final long H5E_CANTGETSIZE = H5E_CANTGETSIZE();
-    /** Minor error codes - Object atom related errors - Unable to increment reference count */
+    /** Minor error codes - Object ID related errors - Unable to increment reference count */
     public static final long H5E_CANTINC = H5E_CANTINC();
     /** Minor error codes - Function entry/exit interface - Unable to initialize object */
     public static final long H5E_CANTINIT = H5E_CANTINIT();
@@ -300,7 +300,7 @@ public class HDF5Constants {
     public static final long H5E_CANTRECV = H5E_CANTRECV();
     /** Minor error codes - B-tree related errors - Unable to redistribute records */
     public static final long H5E_CANTREDISTRIBUTE = H5E_CANTREDISTRIBUTE();
-    /** Minor error codes - Object atom related errors - Unable to register new atom */
+    /** Minor error codes - Object ID related errors - Unable to register new ID */
     public static final long H5E_CANTREGISTER = H5E_CANTREGISTER();
     /** Minor error codes - Function entry/exit interface - Unable to release object */
     public static final long H5E_CANTRELEASE = H5E_CANTRELEASE();
@@ -416,7 +416,7 @@ public class HDF5Constants {
     public static final long H5E_NOENCODER = H5E_NOENCODER();
     /** I/O pipeline errors - Requested filter is not available */
     public static final long H5E_NOFILTER = H5E_NOFILTER();
-    /** Minor error codes - Object atom related errors - Out of IDs for group */
+    /** Minor error codes - Object ID related errors - Out of IDs for group */
     public static final long H5E_NOIDS = H5E_NOIDS();
     /** Major error codes - No error */
     public static final long H5E_NONE_MAJOR = H5E_NONE_MAJOR();
diff --git a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
index 71ba795..62a8047 100644
--- a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
+++ b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
@@ -204,13 +204,13 @@ public class HDF5LibraryException extends HDF5Exception {
             return "Can't release object";
         }
         else if (err_code == HDF5Constants.H5E_BADATOM) {
-            return "Can't find atom information";
+            return "Can't find ID information";
         }
         else if (err_code == HDF5Constants.H5E_BADGROUP) {
             return "Can't find group information";
         }
         else if (err_code == HDF5Constants.H5E_CANTREGISTER) {
-            return "Can't register new atom";
+            return "Can't register new ID";
         }
         else if (err_code == HDF5Constants.H5E_CANTINC) {
             return "Can't increment reference count";
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 5a01dc9..2de5d87 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -813,7 +813,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i
                     if (NULL == (this_str = (char *)HDmalloc(this_len)))
                         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
 
-                    if (HDsnprintf(this_str, "%g", this_len, tmp_double) < 0)
+                    if (HDsnprintf(this_str, this_len, "%g", tmp_double) < 0)
                         H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsnprintf failure");
 
                     break;
@@ -1160,11 +1160,11 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i
 
                                         H5Otoken_to_str(tid, &oi.token, &token_str);
 
-                                        size_t this_len = 64 + strlen(token_str) + 1;
-                                        if (NULL == (this_str = (char *)HDmalloc(this_len)))
+                                        size_t that_len = 64 + strlen(token_str) + 1;
+                                        if (NULL == (this_str = HDmalloc(that_len)))
                                             H5_OUT_OF_MEMORY_ERROR(
                                                 ENVONLY, "h5str_sprintf: failed to allocate string buffer");
-                                        if (HDsnprintf(this_str, this_len, "%lu:%s", oi.fileno, token_str) <
+                                        if (HDsnprintf(this_str, that_len, "%lu:%s", oi.fileno, token_str) <
                                             0)
                                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsnprintf failure");