1 files changed, 28 insertions, 22 deletions

diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c
index 6188138..a230753 100644
--- a/src/H5Tdbg.c
+++ b/src/H5Tdbg.c
@@ -101,16 +101,25 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED * path, int H5_ATTR_UNUSED * nprint/*
     if(H5DEBUG(T) && path->stats.ncalls > 0) {
         hsize_t    nbytes;
         char    bandwidth[32];
-
-    if(nprint && 0 == (*nprint)++) {
-        HDfprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
-        HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
-            "Conversion", "Elmts", "Calls", "User",
-            "System", "Elapsed", "Bandwidth");
-        HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
-            "----------", "-----", "-----", "----",
-            "------", "-------", "---------");
-    } /* end if */
+        struct {
+            char *user;
+            char *system;
+            char *elapsed;
+        } timestrs = {
+            H5_timer_get_time_string(path->stats.times.user),
+            H5_timer_get_time_string(path->stats.times.system),
+            H5_timer_get_time_string(path->stats.times.elapsed)
+        };
+
+        if(nprint && 0 == (*nprint)++) {
+            HDfprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
+            HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
+                "Conversion", "Elmts", "Calls", "User",
+                "System", "Elapsed", "Bandwidth");
+            HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
+                "----------", "-----", "-----", "----",
+                "------", "-------", "---------");
+        } /* end if */
 
         if(path->src && path->dst)
             nbytes = MAX(H5T_get_size(path->src), H5T_get_size(path->dst));
@@ -120,18 +129,15 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED * path, int H5_ATTR_UNUSED * nprint/*
             nbytes = H5T_get_size(path->dst);
         else
             nbytes = 0;
-
-    nbytes *= path->stats.nelmts;
+        nbytes *= path->stats.nelmts;
         H5_bandwidth(bandwidth, (double)nbytes, path->stats.times.elapsed);
-        HDfprintf(H5DEBUG(T), "   %-16s %10Hd %10d %8T %8T %8T %10s\n",
-        path->name,
-        path->stats.nelmts,
-        path->stats.ncalls,
-                   path->stats.times.user,
-                   path->stats.times.system,
-                   path->stats.times.elapsed,
-        bandwidth);
-    } /* end if */
+        HDfprintf(H5DEBUG(T), "   %-16s %10" PRIdHSIZE " %10u %8s %8s %8s %10s\n",
+            path->name, path->stats.nelmts, path->stats.ncalls,
+            timestrs.user, timestrs.system, timestrs.elapsed, bandwidth);
+        free(timestrs.user);
+        free(timestrs.system);
+        free(timestrs.elapsed);
+    }
 #endif
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -417,7 +423,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
 
             HDfprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
             for (k = 0; k < base_size; k++)
-                HDfprintf(stream, "%02p", ((uint8_t *)dt->shared->u.enumer.value + (i * base_size) + k));
+                HDfprintf(stream, "%02" PRIx8, *((uint8_t *)dt->shared->u.enumer.value + (i * base_size) + k));
         } /* end for */
         HDfprintf(stream, "\n");
     }