From 9e56bed5e0921e0d1399325eaf5f092d1f19590a Mon Sep 17 00:00:00 2001
From: Raymond Lu <songyulu@hdfgroup.org>
Date: Tue, 13 Sep 2011 10:55:19 -0500
Subject: [svn-r21379] 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 and VMS.
---
 tools/h5dump/h5dump.c   | 12 ++++++++++--
 tools/lib/h5tools.c     |  6 +++++-
 tools/lib/h5tools_str.c |  4 ++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 17dba83..147f6ab 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 2ed13d0..db81496 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 b278197..e7d920c 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;
-- 
cgit v0.12