Removes remaining register keywords (#1481)

4 files changed, 55 insertions, 57 deletions

diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c
index e316245..1baaca2 100644
--- a/tools/src/h5perf/pio_engine.c
+++ b/tools/src/h5perf/pio_engine.c
@@ -420,7 +420,7 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
         /* If the prefix specifies the HDF5_PARAPREFIX directory, then
          * default to using the "/tmp/$USER" or "/tmp/$LOGIN"
          * directory instead. */
-        register char *user, *login, *subdir;
+        char *user, *login, *subdir;
 
         user   = HDgetenv("USER");
         login  = HDgetenv("LOGIN");
diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c
index c233684..003c4f2 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -200,7 +200,7 @@ static void  output_results(const struct options *options, const char *name, min
                             off_t data_size);
 static void  output_times(const struct options *options, const char *name, minmax *table, int table_size);
 static void  output_report(const char *fmt, ...);
-static void  print_indent(register int indent);
+static void  print_indent(int indent);
 static void  usage(const char *prog);
 static void  report_parameters(struct options *opts);
 static off_t squareo(off_t);
@@ -336,7 +336,7 @@ run_test_loop(struct options *opts)
     /* start with max_num_procs and decrement it by half for each loop. */
     /* if performance needs restart, fewer processes may be needed. */
     for (num_procs = opts->max_num_procs; num_procs >= opts->min_num_procs; num_procs >>= 1) {
-        register size_t buf_size;
+        size_t buf_size;
 
         parms.num_procs = num_procs;
 
@@ -411,34 +411,34 @@ run_test_loop(struct options *opts)
 static int
 run_test(iotype iot, parameters parms, struct options *opts)
 {
-    results      res;
-    register int i, ret_value = SUCCESS;
-    int          comm_size;
-    off_t        raw_size;
-    minmax *     write_mpi_mm_table   = NULL;
-    minmax *     write_mm_table       = NULL;
-    minmax *     write_gross_mm_table = NULL;
-    minmax *     write_raw_mm_table   = NULL;
-    minmax *     read_mpi_mm_table    = NULL;
-    minmax *     read_mm_table        = NULL;
-    minmax *     read_gross_mm_table  = NULL;
-    minmax *     read_raw_mm_table    = NULL;
-    minmax *     read_open_mm_table   = NULL;
-    minmax *     read_close_mm_table  = NULL;
-    minmax *     write_open_mm_table  = NULL;
-    minmax *     write_close_mm_table = NULL;
-    minmax       write_mpi_mm         = {0.0, 0.0, 0.0, 0};
-    minmax       write_mm             = {0.0, 0.0, 0.0, 0};
-    minmax       write_gross_mm       = {0.0, 0.0, 0.0, 0};
-    minmax       write_raw_mm         = {0.0, 0.0, 0.0, 0};
-    minmax       read_mpi_mm          = {0.0, 0.0, 0.0, 0};
-    minmax       read_mm              = {0.0, 0.0, 0.0, 0};
-    minmax       read_gross_mm        = {0.0, 0.0, 0.0, 0};
-    minmax       read_raw_mm          = {0.0, 0.0, 0.0, 0};
-    minmax       read_open_mm         = {0.0, 0.0, 0.0, 0};
-    minmax       read_close_mm        = {0.0, 0.0, 0.0, 0};
-    minmax       write_open_mm        = {0.0, 0.0, 0.0, 0};
-    minmax       write_close_mm       = {0.0, 0.0, 0.0, 0};
+    results res;
+    int     i, ret_value = SUCCESS;
+    int     comm_size;
+    off_t   raw_size;
+    minmax *write_mpi_mm_table   = NULL;
+    minmax *write_mm_table       = NULL;
+    minmax *write_gross_mm_table = NULL;
+    minmax *write_raw_mm_table   = NULL;
+    minmax *read_mpi_mm_table    = NULL;
+    minmax *read_mm_table        = NULL;
+    minmax *read_gross_mm_table  = NULL;
+    minmax *read_raw_mm_table    = NULL;
+    minmax *read_open_mm_table   = NULL;
+    minmax *read_close_mm_table  = NULL;
+    minmax *write_open_mm_table  = NULL;
+    minmax *write_close_mm_table = NULL;
+    minmax  write_mpi_mm         = {0.0, 0.0, 0.0, 0};
+    minmax  write_mm             = {0.0, 0.0, 0.0, 0};
+    minmax  write_gross_mm       = {0.0, 0.0, 0.0, 0};
+    minmax  write_raw_mm         = {0.0, 0.0, 0.0, 0};
+    minmax  read_mpi_mm          = {0.0, 0.0, 0.0, 0};
+    minmax  read_mm              = {0.0, 0.0, 0.0, 0};
+    minmax  read_gross_mm        = {0.0, 0.0, 0.0, 0};
+    minmax  read_raw_mm          = {0.0, 0.0, 0.0, 0};
+    minmax  read_open_mm         = {0.0, 0.0, 0.0, 0};
+    minmax  read_close_mm        = {0.0, 0.0, 0.0, 0};
+    minmax  write_open_mm        = {0.0, 0.0, 0.0, 0};
+    minmax  write_close_mm       = {0.0, 0.0, 0.0, 0};
 
     raw_size      = parms.num_files * (off_t)parms.num_dsets * (off_t)parms.num_bytes;
     parms.io_type = iot;
@@ -1098,10 +1098,9 @@ output_report(const char *fmt, ...)
  *              things.
  * Return:      Nothing
  * Programmer:  Bill Wendling, 29. October 2001
- * Modifications:
  */
 static void
-print_indent(register int indent)
+print_indent(int indent)
 {
     int myrank;
 
@@ -1278,7 +1277,7 @@ report_parameters(struct options *opts)
 static struct options *
 parse_command_line(int argc, const char *const *argv)
 {
-    register int    opt;
+    int             opt;
     struct options *cl_opts;
 
     cl_opts = (struct options *)malloc(sizeof(struct options));
diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c
index 95ec3ce..bdd2c08 100644
--- a/tools/src/h5perf/sio_engine.c
+++ b/tools/src/h5perf/sio_engine.c
@@ -328,7 +328,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
         /* If the prefix specifies the HDF5_PREFIX directory, then
          * default to using the "/tmp/$USER" or "/tmp/$LOGIN"
          * directory instead. */
-        register char *user, *login, *subdir;
+        char *user, *login, *subdir;
 
         user   = HDgetenv("USER");
         login  = HDgetenv("LOGIN");
diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c
index 87b9d65..dc2e15e 100644
--- a/tools/src/h5perf/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -173,7 +173,7 @@ static void            accumulate_minmax_stuff(const minmax *mm, int count, minm
 static void output_results(const struct options *options, const char *name, minmax *table, int table_size,
                            off_t data_size);
 static void output_report(const char *fmt, ...);
-static void print_indent(register int indent);
+static void print_indent(int indent);
 static void usage(const char *prog);
 static void report_parameters(struct options *opts);
 
@@ -299,25 +299,25 @@ run_test_loop(struct options *opts)
 static int
 run_test(iotype iot, parameters parms, struct options *opts)
 {
-    results      res;
-    register int i, ret_value = SUCCESS;
-    off_t        raw_size;
-    minmax *     write_sys_mm_table   = NULL;
-    minmax *     write_mm_table       = NULL;
-    minmax *     write_gross_mm_table = NULL;
-    minmax *     write_raw_mm_table   = NULL;
-    minmax *     read_sys_mm_table    = NULL;
-    minmax *     read_mm_table        = NULL;
-    minmax *     read_gross_mm_table  = NULL;
-    minmax *     read_raw_mm_table    = NULL;
-    minmax       write_sys_mm         = {0.0, 0.0, 0.0, 0};
-    minmax       write_mm             = {0.0, 0.0, 0.0, 0};
-    minmax       write_gross_mm       = {0.0, 0.0, 0.0, 0};
-    minmax       write_raw_mm         = {0.0, 0.0, 0.0, 0};
-    minmax       read_sys_mm          = {0.0, 0.0, 0.0, 0};
-    minmax       read_mm              = {0.0, 0.0, 0.0, 0};
-    minmax       read_gross_mm        = {0.0, 0.0, 0.0, 0};
-    minmax       read_raw_mm          = {0.0, 0.0, 0.0, 0};
+    results res;
+    int     i, ret_value = SUCCESS;
+    off_t   raw_size;
+    minmax *write_sys_mm_table   = NULL;
+    minmax *write_mm_table       = NULL;
+    minmax *write_gross_mm_table = NULL;
+    minmax *write_raw_mm_table   = NULL;
+    minmax *read_sys_mm_table    = NULL;
+    minmax *read_mm_table        = NULL;
+    minmax *read_gross_mm_table  = NULL;
+    minmax *read_raw_mm_table    = NULL;
+    minmax  write_sys_mm         = {0.0, 0.0, 0.0, 0};
+    minmax  write_mm             = {0.0, 0.0, 0.0, 0};
+    minmax  write_gross_mm       = {0.0, 0.0, 0.0, 0};
+    minmax  write_raw_mm         = {0.0, 0.0, 0.0, 0};
+    minmax  read_sys_mm          = {0.0, 0.0, 0.0, 0};
+    minmax  read_mm              = {0.0, 0.0, 0.0, 0};
+    minmax  read_gross_mm        = {0.0, 0.0, 0.0, 0};
+    minmax  read_raw_mm          = {0.0, 0.0, 0.0, 0};
 
     raw_size      = (off_t)parms.num_bytes;
     parms.io_type = iot;
@@ -657,10 +657,9 @@ output_report(const char *fmt, ...)
  *              things.
  * Return:      Nothing
  * Programmer:  Bill Wendling, 29. October 2001
- * Modifications:
  */
 static void
-print_indent(register int indent)
+print_indent(int indent)
 {
     indent *= TAB_SPACE;