From faea627254f89a8d2209ddf04870ed4b9def47f8 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Wed, 27 Jul 2016 11:56:42 -0500
Subject: [svn-r30224] Added HDprintf() macro that uses HDfprintf w/ stdout.

Tested on: 64-bit Ubuntu Linux 16.04 LTS w/ gcc 5.4.0
           Autotools serial
---
 src/H5private.h  |  4 +++-
 test/lheap.c     | 12 ++++++------
 test/links_env.c |  8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/H5private.h b/src/H5private.h
index 6a677bb..4c40965 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1142,7 +1142,9 @@ typedef off_t               h5_stat_size_t;
 #ifndef HDpowf
     #define HDpowf(X,Y)   powf(X,Y)
 #endif /* HDpowf */
-/* printf() variable arguments */
+#ifndef HDprintf
+    #define HDprintf(...)   HDfprintf(stdout, __VA_ARGS__)
+#endif /* HDprintf */
 #ifndef HDputc
     #define HDputc(C,F)    putc(C,F)
 #endif /* HDputc*/
diff --git a/test/lheap.c b/test/lheap.c
index 2f3359f..61323a9 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -158,9 +158,9 @@ main(void)
 
         if (strcmp(s, buf)) {
             H5_FAILED();
-            printf("    i=%d, heap offset=%lu\n", i, (unsigned long)(obj[i]));
-            printf("    got: \"%s\"\n", s);
-            printf("    ans: \"%s\"\n", buf);
+            HDprintf("    i=%d, heap offset=%lu\n", i, (unsigned long)(obj[i]));
+            HDprintf("    got: \"%s\"\n", s);
+            HDprintf("    ans: \"%s\"\n", buf);
             goto error;
         }
 
@@ -191,7 +191,7 @@ main(void)
         }
         else {
             H5_FAILED();
-            printf("***cannot open the pre-created non-default sizes test file (%s)\n",
+            HDprintf("***cannot open the pre-created non-default sizes test file (%s)\n",
                 testfile);
             goto error;
         } /* end else */
@@ -201,13 +201,13 @@ main(void)
     /* Verify symbol table messages are cached */
     if(h5_verify_cached_stabs(FILENAME, fapl) < 0) TEST_ERROR
 
-    puts("All local heap tests passed.");
+    HDputs("All local heap tests passed.");
     h5_cleanup(FILENAME, fapl);
 
     return 0;
 
  error:
-    puts("*** TESTS FAILED ***");
+    HDputs("*** TESTS FAILED ***");
     H5E_BEGIN_TRY {
         H5Fclose(file);
     } H5E_END_TRY;
diff --git a/test/links_env.c b/test/links_env.c
index b3fec38..b9ecafa 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -173,11 +173,11 @@ main(void)
 
     /* Results */
     if(nerrors) {
-        printf("***** %d External Link (HDF5_EXT_PREFIX) test%s FAILED! *****\n",
+        HDprintf("***** %d External Link (HDF5_EXT_PREFIX) test%s FAILED! *****\n",
                 nerrors, 1 == nerrors ? "" : "s");
-        exit(1);
+        HDexit(1);
     }
-    printf("All external Link (HDF5_EXT_PREFIX) tests passed.\n");
+    HDprintf("All external Link (HDF5_EXT_PREFIX) tests passed.\n");
 
     /* clean up tmp directory created by external link tests */
     HDrmdir(TMPDIR);
@@ -185,6 +185,6 @@ main(void)
     return 0;
 
 error:
-    puts("*** TESTS FAILED ***");
+    HDputs("*** TESTS FAILED ***");
     return 1;
 }
-- 
cgit v0.12