summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/h5_extlink.c4
-rw-r--r--hl/test/test_packet.c2
-rw-r--r--java/examples/datasets/H5Ex_D_Sofloat.java13
-rw-r--r--java/examples/testfiles/examples.datasets.H5Ex_D_Sofloat.txt8
-rw-r--r--src/H5private.h2
5 files changed, 17 insertions, 12 deletions
diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index f9d4046..61fd589 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -414,14 +414,14 @@ UD_hard_create(const char *link_name, hid_t loc_group, const void *udata, size_t
token = *((H5O_token_t *)udata);
- //! [H5Open_by_token_snip]
+ //! [H5Oopen_by_token_snip]
/* Open the object this link points to so that we can increment
* its reference count. This also ensures that the token passed
* in points to a real object (although this check is not perfect!) */
target_obj = H5Oopen_by_token(loc_group, token);
- //! [H5Open_by_token_snip]
+ //! [H5Oopen_by_token_snip]
if (target_obj < 0) {
ret_value = -1;
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 5f30d4b..e8b90f7 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -47,7 +47,7 @@ typedef struct particle_t {
*/
static particle_t testPart[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0}, {"one", 10, 10, 1.0F, 10.0},
{"two", 20, 20, 2.0F, 20.0}, {"three", 30, 30, 3.0F, 30.0},
- {"Four", 40, 40, 4.0F, 40.0}, {"Five", 50, 50, 5.0F, 50.0},
+ {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
{"six", 60, 60, 6.0F, 60.0}, {"seven", 70, 70, 7.0F, 70.0}};
/*-------------------------------------------------------------------------
diff --git a/java/examples/datasets/H5Ex_D_Sofloat.java b/java/examples/datasets/H5Ex_D_Sofloat.java
index a42aba4..8edde09 100644
--- a/java/examples/datasets/H5Ex_D_Sofloat.java
+++ b/java/examples/datasets/H5Ex_D_Sofloat.java
@@ -21,6 +21,9 @@
************************************************************/
package examples.datasets;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
@@ -123,8 +126,9 @@ public class H5Ex_D_Sofloat {
}
// Print the maximum value.
- System.out.println("Maximum value in write buffer is: " + max);
- System.out.println("Minimum value in write buffer is: " + min);
+ DecimalFormat df = new DecimalFormat("#,##0.000000", new DecimalFormatSymbols(Locale.US));
+ System.out.println("Maximum value in write buffer is: " + df.format(max));
+ System.out.println("Minimum value in write buffer is: " + df.format(min));
// Create a new file using the default properties.
try {
@@ -308,8 +312,9 @@ public class H5Ex_D_Sofloat {
}
// Print the maximum value.
- System.out.println("Maximum value in " + DATASETNAME + " is: " + max);
- System.out.println("Minimum value in " + DATASETNAME + " is: " + min);
+ DecimalFormat df = new DecimalFormat("#,##0.000000", new DecimalFormatSymbols(Locale.US));
+ System.out.println("Maximum value in " + DATASETNAME + " is: " + df.format(max));
+ System.out.println("Minimum value in " + DATASETNAME + " is: " + df.format(min));
// End access to the dataset and release resources used by it.
try {
diff --git a/java/examples/testfiles/examples.datasets.H5Ex_D_Sofloat.txt b/java/examples/testfiles/examples.datasets.H5Ex_D_Sofloat.txt
index 4d4b5d6..9025ce2 100644
--- a/java/examples/testfiles/examples.datasets.H5Ex_D_Sofloat.txt
+++ b/java/examples/testfiles/examples.datasets.H5Ex_D_Sofloat.txt
@@ -1,6 +1,6 @@
-Maximum value in write buffer is: 106.66666666666667
-Minimum value in write buffer is: 1.7692307692307692
+Maximum value in write buffer is: 106.666667
+Minimum value in write buffer is: 1.769231
Filter type is: H5Z_FILTER_SCALEOFFSET
-Maximum value in DS1 is: 106.66169811320755
-Minimum value in DS1 is: 1.7692307692307692
+Maximum value in DS1 is: 106.661698
+Minimum value in DS1 is: 1.769231
diff --git a/src/H5private.h b/src/H5private.h
index 7838f46..5b0e33b 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -576,7 +576,7 @@ typedef off_t h5_stat_size_t;
#define HDoff_t off_t
#endif
-#/* Redefine all the POSIX and C functions. We should never see an
+/* Redefine all the POSIX and C functions. We should never see an
* undecorated POSIX or C function (or any other non-HDF5 function)
* in the source.
*/