Merge pull request #2650 in HDFFV/hdf5 from ~DYOUNG/werror:rebased-fprintf-experiment to develop

* commit 'c0fbc5c086566d5d3c1d1ef26baa81a53d59fc08': (24 commits)
  Use the right format string, "%zu", for size_t.
  Repair more format strings.
  Fix a bunch of format string errors reported by Larry.
  Fix some HDfprintf compilation errors: use the right format strings ("zu", PRIuHSIZE), avoid casting some printf arguments, pass the right number of arguments.
  Test the format string "ll" before "l", "L", and "q", like the ./configure script does.  This ought to fix the compilation failure in test/dt_arith.c that Allen told me about:
  Cast a non-void pointer to void pointer for "%p".
  Use PRIu32 and "zu" formats.  Delete some casts from `size_t`.
  I'm taking a guess that this code intended to point the 2-digit wide hexadecimal octet values, not 2 character-wide pointers to the bytes.  The %02p format, which is a GNU-ism, disagreed with GCC 8.3.0 and the option flags we use.
  %08p is not portable, it's a GNU-ism.  Use %8p, instead.  Squashes a GCC error.
  Add format string macros PRI[doxX]HID for hid_t and use PRIdHID.
  Use HDva_copy() and introduce a bunch of compatbility format-string constants for uppercase hexadecimal strings, `PRIX...`.  Should fix the VS2010 errors that Allen mentioned:
  Always #define HDfprintf as fprintf in this header.  I believe this will fix the Windows build error that Allen reported.
  Provide an HDvasprintf implementation only if it isn't #defined.  This should fix the mingw compilation issue that Allen reported.
  Fix va_list usage in the vasprintf(3) implementation.
  Promote format-string warnings to errors.
  Use the portable `-eq` operator instead of the bash-ism `==`. Fixes the tests on NetBSD, where /bin/sh != bash.
  Restore a literal percent sign ("%%") that I accidentally deleted.
  Fix code that made GCC complain about a NULL or `unsigned char *` arguments for "%s".
  Take pains to provide UINT64_MAX in all conditions.
  Correct a couple of format strings.
  ...

1 files changed, 28 insertions, 13 deletions

diff --git a/src/H5Z.c b/src/H5Z.c
index 5c1cfd6..60b2ebe 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -139,8 +139,17 @@ H5Z_term_package(void)
         if(H5DEBUG(Z)) {
             for(i = 0; i < H5Z_table_used_g; i++) {
                 for(dir = 0; dir<2; dir++) {
+                    struct {
+                        char *user;
+                        char *system;
+                        char *elapsed;
+                    } timestrs = {
+                        H5_timer_get_time_string(H5Z_stat_table_g[i].stats[dir].times.user),
+                        H5_timer_get_time_string(H5Z_stat_table_g[i].stats[dir].times.system),
+                        H5_timer_get_time_string(H5Z_stat_table_g[i].stats[dir].times.elapsed)
+                    };
                     if(0 == H5Z_stat_table_g[i].stats[dir].total)
-                        continue;
+                        goto next;
 
                     if(0 == nprint++) {
                         /* Print column headers */
@@ -161,23 +170,29 @@ H5Z_term_package(void)
                     comment[sizeof(comment) - 1] = '\0';
 
                     /*
-                    * Format bandwidth to have four significant digits and
-                    * units of `B/s', `kB/s', `MB/s', `GB/s', or `TB/s' or
-                    * the word `Inf' if the elapsed time is zero.
-                    */
+                     * Format bandwidth to have four significant digits and
+                     * units of `B/s', `kB/s', `MB/s', `GB/s', or `TB/s' or
+                     * the word `Inf' if the elapsed time is zero.
+                     */
                     H5_bandwidth(bandwidth,
                             (double)(H5Z_stat_table_g[i].stats[dir].total),
                             H5Z_stat_table_g[i].stats[dir].times.elapsed);
 
                     /* Print the statistics */
-                    HDfprintf(H5DEBUG(Z), "   %s%-15s %10Hd %10Hd %8T %8T %8T %10s\n",
-                            (dir ? "<" : ">"), comment,
-                            H5Z_stat_table_g[i].stats[dir].total,
-                            H5Z_stat_table_g[i].stats[dir].errors,
-                            H5Z_stat_table_g[i].stats[dir].times.user,
-                            H5Z_stat_table_g[i].stats[dir].times.system,
-                            H5Z_stat_table_g[i].stats[dir].times.elapsed,
-                            bandwidth);
+                    HDfprintf(H5DEBUG(Z),
+                        "   %s%-15s %10" PRIdHSIZE " %10" PRIdHSIZE
+                        " %8s %8s %8s %10s\n",
+                        (dir ? "<" : ">"), comment,
+                        H5Z_stat_table_g[i].stats[dir].total,
+                        H5Z_stat_table_g[i].stats[dir].errors,
+                        timestrs.user,
+                        timestrs.system,
+                        timestrs.elapsed,
+                        bandwidth);
+    next:
+                    free(timestrs.user);
+                    free(timestrs.system);
+                    free(timestrs.elapsed);
                 } /* end for */
             } /* end for */
         } /* end if */