Merge changes from develop

Comments and whitespace
Skip file-locking and cache changes

7 files changed, 23 insertions, 22 deletions

diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c
index 90ae815..9f99ce9 100644
--- a/tools/test/perform/chunk.c
+++ b/tools/test/perform/chunk.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <robb@arborea.spizella.com>
+ * Programmer:  Robb Matzke
  *              Thursday, May 14, 1998
  *
  * Purpose:	Checks the effect of various I/O request sizes and raw data
diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c
index 9a6d5fa..3a6a209 100644
--- a/tools/test/perform/chunk_cache.c
+++ b/tools/test/perform/chunk_cache.c
@@ -259,11 +259,11 @@ check_partial_chunks_perf(hid_t file)
     end_t = H5_get_time();
 
     if ((end_t - start_t) > (double)0.0f)
-        printf("1. Partial chunks: total read time is %lf; number of bytes being read from file is %lu\n",
+        printf("1. Partial chunks: total read time is %lf; number of bytes being read from file is %zu\n",
                (end_t - start_t), nbytes_global);
     else
         printf("1. Partial chunks: no total read time because timer is not available; number of bytes being "
-               "read from file is %lu\n",
+               "read from file is %zu\n",
                nbytes_global);
 
     H5Dclose(dataset);
@@ -337,11 +337,11 @@ check_hash_value_perf(hid_t file)
     end_t = H5_get_time();
 
     if ((end_t - start_t) > (double)0.0f)
-        printf("2. Hash value: total read time is %lf; number of bytes being read from file is %lu\n",
+        printf("2. Hash value: total read time is %lf; number of bytes being read from file is %zu\n",
                (end_t - start_t), nbytes_global);
     else
         printf("2. Hash value: no total read time because timer is not available; number of bytes being read "
-               "from file is %lu\n",
+               "from file is %zu\n",
                nbytes_global);
 
     H5Dclose(dataset);
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index 6d467e1..22aca04 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -313,7 +313,7 @@ main(int argc, char **argv)
         VRFY((ret >= 0), "H5Dwrite dataset1 succeeded", !H5FATAL);
 
         if (ret < 0)
-            HDfprintf(stderr, "node %d, read error, loc = %Ld: %s\n", mynod, mynod * opt_block,
+            HDfprintf(stderr, "node %d, read error, loc = %" PRId64 ": %s\n", mynod, mynod * opt_block,
                       strerror(myerrno));
 
         /* if the user wanted to check correctness, compare the write
@@ -427,7 +427,8 @@ parse_args(int argc, char **argv)
                 if (NULL != (p = (char *)HDstrchr(optarg, '/')))
                     opt_threshold = (hsize_t)HDatoi(p + 1);
             }
-                HDfprintf(stdout, "alignment/threshold=%Hu/%Hu\n", opt_alignment, opt_threshold);
+                HDfprintf(stdout, "alignment/threshold=%" PRIuHSIZE "/%" PRIuHSIZE "\n", opt_alignment,
+                          opt_threshold);
                 break;
             case '2': /* use 2-files, i.e., split file driver */
                 opt_split_vfd = 1;
diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h
index 0e0ac26..d64f421 100644
--- a/tools/test/perform/pio_standalone.h
+++ b/tools/test/perform/pio_standalone.h
@@ -130,12 +130,12 @@
 #else /* H5_HAVE_WIN32_API */
 #define HDfileno(F) fileno(F)
 #endif /* H5_HAVE_WIN32_API */
-#define HDfloor(X)        floor(X)
-#define HDfmod(X, Y)      fmod(X, Y)
-#define HDfopen(S, M)     fopen(S, M)
-#define HDfork()          fork()
-#define HDfpathconf(F, N) fpathconf(F, N)
-H5_DLL int HDfprintf(FILE *stream, const char *fmt, ...);
+#define HDfloor(X)          floor(X)
+#define HDfmod(X, Y)        fmod(X, Y)
+#define HDfopen(S, M)       fopen(S, M)
+#define HDfork()            fork()
+#define HDfpathconf(F, N)   fpathconf(F, N)
+#define HDfprintf           fprintf
 #define HDfputc(C, F)       fputc(C, F)
 #define HDfputs(S, F)       fputs(S, F)
 #define HDfread(M, Z, N, F) fread(M, Z, N, F)
diff --git a/tools/test/perform/sio_engine.c b/tools/test/perform/sio_engine.c
index 79577b3..11001c6 100644
--- a/tools/test/perform/sio_engine.c
+++ b/tools/test/perform/sio_engine.c
@@ -783,7 +783,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
 
     /* Allocate data verification buffer */
     if (NULL == (buffer2 = (char *)malloc(linear_buf_size))) {
-        HDfprintf(stderr, "malloc for data verification buffer size (%Zu) failed\n", linear_buf_size);
+        HDfprintf(stderr, "malloc for data verification buffer size (%zu) failed\n", linear_buf_size);
         GOTOERROR(FAIL);
     } /* end if */
 
diff --git a/tools/test/perform/sio_perf.c b/tools/test/perform/sio_perf.c
index d2425fd..fb31080 100644
--- a/tools/test/perform/sio_perf.c
+++ b/tools/test/perform/sio_perf.c
@@ -872,9 +872,9 @@ report_parameters(struct options *opts)
     HDfprintf(output, "\n");
 
     if (opts->page_size) {
-        HDfprintf(output, "Page Aggregation Enabled. Page size = %ld\n", opts->page_size);
+        HDfprintf(output, "Page Aggregation Enabled. Page size = %zu\n", opts->page_size);
         if (opts->page_buffer_size)
-            HDfprintf(output, "Page Buffering Enabled. Page Buffer size = %ld\n", opts->page_buffer_size);
+            HDfprintf(output, "Page Buffering Enabled. Page Buffer size = %zu\n", opts->page_buffer_size);
         else
             HDfprintf(output, "Page Buffering Disabled\n");
     }
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index 02ec6c6..4001257 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -145,12 +145,12 @@
 #else /* H5_HAVE_WIN32_API */
 #define HDfileno(F) fileno(F)
 #endif /* H5_HAVE_WIN32_API */
-#define HDfloor(X)        floor(X)
-#define HDfmod(X, Y)      fmod(X, Y)
-#define HDfopen(S, M)     fopen(S, M)
-#define HDfork()          fork()
-#define HDfpathconf(F, N) fpathconf(F, N)
-H5_DLL int HDfprintf(FILE *stream, const char *fmt, ...);
+#define HDfloor(X)          floor(X)
+#define HDfmod(X, Y)        fmod(X, Y)
+#define HDfopen(S, M)       fopen(S, M)
+#define HDfork()            fork()
+#define HDfpathconf(F, N)   fpathconf(F, N)
+#define HDfprintf           fprintf
 #define HDfputc(C, F)       fputc(C, F)
 #define HDfputs(S, F)       fputs(S, F)
 #define HDfread(M, Z, N, F) fread(M, Z, N, F)