summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2011-09-13 15:45:34 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2011-09-13 15:45:34 (GMT)
commit64b1807783208d620e23edf10504cc15d84a4129 (patch)
tree317b8154525e592f6e7d1bca8d7c41a7de5534a2
parent645fae330db34b49ed06d75fef0a1b680821a906 (diff)
downloadhdf5-64b1807783208d620e23edf10504cc15d84a4129.zip
hdf5-64b1807783208d620e23edf10504cc15d84a4129.tar.gz
hdf5-64b1807783208d620e23edf10504cc15d84a4129.tar.bz2
[svn-r21378] The tools used "%hhd" to print signed char. But VMS doesn't know it. So I used H5_VMS to have a different way ("%hd") to print it.
Tested on jam. Not tested on VMS yet. Simple change.
-rw-r--r--tools/h5dump/h5dump.c12
-rw-r--r--tools/lib/h5tools.c6
-rw-r--r--tools/lib/h5tools_str.c4
3 files changed, 19 insertions, 3 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 968656a..268824a 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -144,7 +144,11 @@ static h5tool_format_t dataformat = {
"", /*fmt_raw */
"%d", /*fmt_int */
"%u", /*fmt_uint */
- "%hhd", /*fmt_schar */
+#ifdef H5_VMS
+ "%hd", /*fmt_schar */
+#else
+ "%hhd", /*fmt_schar */
+#endif
"%u", /*fmt_uchar */
"%d", /*fmt_short */
"%u", /*fmt_ushort */
@@ -228,7 +232,11 @@ static h5tool_format_t xml_dataformat = {
"", /*fmt_raw */
"%d", /*fmt_int */
"%u", /*fmt_uint */
- "%hhd", /*fmt_schar */
+#ifdef H5_VMS
+ "%hd", /*fmt_schar */
+#else
+ "%hhd", /*fmt_schar */
+#endif
"%u", /*fmt_uchar */
"%d", /*fmt_short */
"%u", /*fmt_ushort */
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index c9cb00f..c08c030 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -52,7 +52,11 @@ static h5tool_format_t h5tools_dataformat = {
"", /*fmt_raw */
"%d", /*fmt_int */
"%u", /*fmt_uint */
-"%hhd", /*fmt_schar */
+#ifdef H5_VMS
+"%hd",/*fmt_schar */
+#else
+"%hhd",/*fmt_schar */
+#endif
"%u", /*fmt_uchar */
"%d", /*fmt_short */
"%u", /*fmt_ushort */
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index fd9ccb9..205dffe 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -836,7 +836,11 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
else
tempchar = (tempchar >> packed_data_offset) & packed_data_mask;
}
+#ifdef H5_VMS
+ h5tools_str_append(str, OPT(info->fmt_schar, "%hd"), tempchar);
+#else
h5tools_str_append(str, OPT(info->fmt_schar, "%hhd"), tempchar);
+#endif
}
else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
unsigned char tempuchar;