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, 8 insertions, 8 deletions

diff --git a/test/fheap.c b/test/fheap.c
index 18d16a1..715b935 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -277,35 +277,35 @@ check_stats(const H5HF_t *fh, const fheap_heap_state_t *state)
     if(H5HF_stat_info(fh, &heap_stats) < 0)
         FAIL_STACK_ERROR
     if(heap_stats.man_nobjs != state->man_nobjs) {
-        HDfprintf(stdout, "heap_stats.man_nobjs = %Hu, state->man_nobjs = %Zu\n", heap_stats.man_nobjs, state->man_nobjs);
+        HDfprintf(stdout, "heap_stats.man_nobjs = %" PRIuHSIZE ", state->man_nobjs = %zu\n", heap_stats.man_nobjs, state->man_nobjs);
         TEST_ERROR
     } /* end if */
     if(heap_stats.man_size != state->man_size) {
-        HDfprintf(stdout, "heap_stats.man_size = %Hu, state->man_size = %Hu\n", heap_stats.man_size, state->man_size);
+        HDfprintf(stdout, "heap_stats.man_size = %" PRIuHSIZE ", state->man_size = %" PRIuHSIZE "\n", heap_stats.man_size, state->man_size);
         TEST_ERROR
     } /* end if */
     if(heap_stats.man_alloc_size != state->man_alloc_size) {
-        HDfprintf(stdout, "heap_stats.man_alloc_size = %Hu, state->man_alloc_size = %Hu\n", heap_stats.man_alloc_size, state->man_alloc_size);
+        HDfprintf(stdout, "heap_stats.man_alloc_size = %" PRIuHSIZE ", state->man_alloc_size = %" PRIuHSIZE "\n", heap_stats.man_alloc_size, state->man_alloc_size);
         TEST_ERROR
     } /* end if */
     if(heap_stats.man_free_space != state->man_free_space) {
-        HDfprintf(stdout, "heap_stats.man_free_space = %Hu, state->man_free_space = %Hu\n", heap_stats.man_free_space, state->man_free_space);
+        HDfprintf(stdout, "heap_stats.man_free_space = %" PRIuHSIZE ", state->man_free_space = %" PRIuHSIZE "\n", heap_stats.man_free_space, state->man_free_space);
         TEST_ERROR
     } /* end if */
     if(heap_stats.huge_nobjs != state->huge_nobjs) {
-        HDfprintf(stdout, "heap_stats.huge_nobjs = %Hu, state->huge_nobjs = %Zu\n", heap_stats.huge_nobjs, state->huge_nobjs);
+        HDfprintf(stdout, "heap_stats.huge_nobjs = %" PRIuHSIZE ", state->huge_nobjs = %zu\n", heap_stats.huge_nobjs, state->huge_nobjs);
         TEST_ERROR
     } /* end if */
     if(heap_stats.huge_size != state->huge_size) {
-        HDfprintf(stdout, "heap_stats.huge_size = %Hu, state->huge_size = %Hu\n", heap_stats.huge_size, state->huge_size);
+        HDfprintf(stdout, "heap_stats.huge_size = %" PRIuHSIZE ", state->huge_size = %" PRIuHSIZE "\n", heap_stats.huge_size, state->huge_size);
         TEST_ERROR
     } /* end if */
     if(heap_stats.tiny_nobjs != state->tiny_nobjs) {
-        HDfprintf(stdout, "heap_stats.tiny_nobjs = %Hu, state->tiny_nobjs = %Zu\n", heap_stats.tiny_nobjs, state->tiny_nobjs);
+        HDfprintf(stdout, "heap_stats.tiny_nobjs = %" PRIuHSIZE ", state->tiny_nobjs = %zu\n", heap_stats.tiny_nobjs, state->tiny_nobjs);
         TEST_ERROR
     } /* end if */
     if(heap_stats.tiny_size != state->tiny_size) {
-        HDfprintf(stdout, "heap_stats.tiny_size = %Hu, state->tiny_size = %Hu\n", heap_stats.tiny_size, state->tiny_size);
+        HDfprintf(stdout, "heap_stats.tiny_size = %" PRIuHSIZE ", state->tiny_size = %" PRIuHSIZE "\n", heap_stats.tiny_size, state->tiny_size);
         TEST_ERROR
     } /* end if */