summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2000-11-16 21:35:59 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2000-11-16 21:35:59 (GMT)
commit815e70db63e4ce33794d57b0ff85a16d9b5d5a4d (patch)
tree8e8478c4a41d7ae4b7d3b1c92bf7548e917e1da5
parent5387697213fa4e53205664c3d90f81def08cee6f (diff)
downloadhdf5-815e70db63e4ce33794d57b0ff85a16d9b5d5a4d.zip
hdf5-815e70db63e4ce33794d57b0ff85a16d9b5d5a4d.tar.gz
hdf5-815e70db63e4ce33794d57b0ff85a16d9b5d5a4d.tar.bz2
[svn-r2956] Purpose:
Backing out fix Description: The fix I inserted didn't work on all platforms. I'm backing it out.
-rw-r--r--tools/h5dump.c4
-rw-r--r--tools/h5tools.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/tools/h5dump.c b/tools/h5dump.c
index f961555..515e61c 100644
--- a/tools/h5dump.c
+++ b/tools/h5dump.c
@@ -47,8 +47,8 @@ static h5dump_t dataformat = {
"%lu", /*fmt_ulong*/
NULL, /*fmt_llong*/
NULL, /*fmt_ullong*/
- "%1.*g", /*fmt_double*/
- "%1.*g", /*fmt_float*/
+ "%g", /*fmt_double*/
+ "%g", /*fmt_float*/
0, /*ascii*/
0, /*str_locale*/
diff --git a/tools/h5tools.c b/tools/h5tools.c
index 293e403..5a7b7d2 100644
--- a/tools/h5tools.c
+++ b/tools/h5tools.c
@@ -713,12 +713,10 @@ h5dump_sprint(h5dump_str_t *str/*in,out*/, const h5dump_t *info,
h5dump_str_append(str, OPT(info->fmt_raw, "%02x"), ucp_vp[i]);
} else if (H5Tequal(type, H5T_NATIVE_DOUBLE)) {
memcpy(&tempdouble, vp, sizeof(double));
- h5dump_str_append(str, OPT(info->fmt_double, "%1.*g"),
- DBL_DIG, tempdouble);
+ h5dump_str_append(str, OPT(info->fmt_double, "%g"), tempdouble);
} else if (H5Tequal(type, H5T_NATIVE_FLOAT)) {
memcpy(&tempfloat, vp, sizeof(float));
- h5dump_str_append(str, OPT(info->fmt_double, "%1.*g"),
- FLT_DIG, tempfloat);
+ h5dump_str_append(str, OPT(info->fmt_double, "g"), tempfloat);
} else if (info->ascii &&
(H5Tequal(type, H5T_NATIVE_SCHAR) ||
H5Tequal(type, H5T_NATIVE_UCHAR))) {