1.12: Last round of normalizations for 1.12.2 (#1621)

9 files changed, 7 insertions, 25 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 3c447a7..6d80082 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -1005,7 +1005,7 @@ done:
 H5_ATTR_PURE static size_t
 h5tools_count_ncols(const char *s)
 {
-    register size_t i;
+    size_t i;
 
     for (i = 0; *s; s++)
         if (*s >= ' ')
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 444bab7..84d99ca 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -255,7 +255,7 @@ get_option(int argc, const char *const *argv, const char *opts, const struct lon
         HDfree(arg);
     }
     else {
-        register char *cp; /* pointer into current token */
+        char *cp; /* pointer into current token */
 
         /* short command line option */
         optchar = argv[opt_ind][sp];
diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c
index 1b6793a..1b08e95 100644
--- a/tools/test/perform/chunk.c
+++ b/tools/test/perform/chunk.c
@@ -24,12 +24,10 @@
 #undef NDEBUG
 #include "hdf5.h"
 
-#ifdef H5_STDC_HEADERS
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#endif
 
 /* Solaris Studio defines attribute, but for the attributes we need */
 #if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus || defined(__SUNPRO_C)
diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c
index 2687ce9..64192ba 100644
--- a/tools/test/perform/overhead.c
+++ b/tools/test/perform/overhead.c
@@ -23,17 +23,11 @@
 #include "hdf5.h"
 #include "H5private.h"
 
-#ifdef H5_STDC_HEADERS
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <string.h>
-#endif
-
-#ifdef H5_HAVE_IO_H
-#include <io.h>
-#endif
 
 #ifdef H5_HAVE_UNISTD_H
 #include <sys/types.h>
diff --git a/tools/test/perform/pio_standalone.c b/tools/test/perform/pio_standalone.c
index b4680a4..4fab8c4 100644
--- a/tools/test/perform/pio_standalone.c
+++ b/tools/test/perform/pio_standalone.c
@@ -97,7 +97,7 @@ get_option(int argc, const char *const *argv, const char *opts, const struct lon
         sp = 1;
     }
     else {
-        register char *cp; /* pointer into current token */
+        char *cp; /* pointer into current token */
 
         /* short command line option */
         opt_opt = argv[opt_ind][sp];
diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h
index 1b83e21..5e56c92 100644
--- a/tools/test/perform/pio_standalone.h
+++ b/tools/test/perform/pio_standalone.h
@@ -21,10 +21,6 @@
 
 #include "H5public.h" /* Include Public Definitions    */
 
-/*
- * Include ANSI-C header files.
- */
-#ifdef H5_STDC_HEADERS
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -37,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#endif
 
 /*
  * Redefine all the POSIX functions.  We should never see a POSIX
diff --git a/tools/test/perform/sio_standalone.c b/tools/test/perform/sio_standalone.c
index 21a2fb5..65a655e 100644
--- a/tools/test/perform/sio_standalone.c
+++ b/tools/test/perform/sio_standalone.c
@@ -97,7 +97,7 @@ get_option(int argc, const char *const *argv, const char *opts, const struct lon
         sp = 1;
     }
     else {
-        register char *cp; /* pointer into current token */
+        char *cp; /* pointer into current token */
 
         /* short command line option */
         opt_opt = argv[opt_ind][sp];
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index cadc00d..02bd647 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -21,10 +21,6 @@
 
 #include "H5public.h" /* Include Public Definitions    */
 
-/*
- * Include ANSI-C header files.
- */
-#ifdef H5_STDC_HEADERS
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -37,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#endif
 
 /* maximum of two, three, or four values */
 #undef MAX
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 040e774..6a8dac8 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -336,8 +336,8 @@ parse_size_directive(const char *size)
 static void
 fill_with_random_data(Bytef *src, uLongf src_len)
 {
-    register unsigned u;
-    h5_stat_t         stat_buf;
+    unsigned  u;
+    h5_stat_t stat_buf;
 
     if (HDstat("/dev/urandom", &stat_buf) == 0) {
         uLongf len = src_len;
@@ -386,7 +386,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
     Bytef *        src;
 
     for (src_len = min_buf_size; src_len <= max_buf_size; src_len <<= 1) {
-        register unsigned long i, iters;
+        unsigned long i, iters;
 
         iters = file_size / src_len;
         src   = (Bytef *)HDcalloc(1, sizeof(Bytef) * src_len);