Formats the source and updates the gcc warning pragmas

1 files changed, 113 insertions, 114 deletions

diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c
index 41f8437..9ca2fb0 100644
--- a/test/swmr_remove_reader.c
+++ b/test/swmr_remove_reader.c
@@ -42,13 +42,11 @@ static hid_t symbol_tid = -1;
 /* Local Prototypes */
 /********************/
 
-static int check_dataset(hid_t fid, unsigned verbose, const char *sym_name,
-    symbol_t *record, hid_t rec_sid);
-static int read_records(const char *filename, unsigned verbose, unsigned long nseconds,
-    unsigned poll_time, unsigned ncommon, unsigned nrandom);
+static int  check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *record, hid_t rec_sid);
+static int  read_records(const char *filename, unsigned verbose, unsigned long nseconds, unsigned poll_time,
+                         unsigned ncommon, unsigned nrandom);
 static void usage(void);
 
-
 /*-------------------------------------------------------------------------
  * Function:    check_dataset
  *
@@ -79,13 +77,12 @@ static void usage(void);
  *-------------------------------------------------------------------------
  */
 static int
-check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *record,
-    hid_t rec_sid)
+check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *record, hid_t rec_sid)
 {
-    hid_t dsid;                 /* Dataset ID */
-    hid_t file_sid;             /* Dataset's space ID */
-    hssize_t snpoints;          /* Number of elements in dataset */
-    hsize_t start[2] = {0, 0}, count[2] = {1, 1}; /* Hyperslab selection values */
+    hid_t    dsid;                                 /* Dataset ID */
+    hid_t    file_sid;                             /* Dataset's space ID */
+    hssize_t snpoints;                             /* Number of elements in dataset */
+    hsize_t  start[2] = {0, 0}, count[2] = {1, 1}; /* Hyperslab selection values */
 
     HDassert(fid >= 0);
     HDassert(sym_name);
@@ -93,67 +90,67 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor
     HDassert(rec_sid >= 0);
 
     /* Open dataset for symbol */
-    if((dsid = H5Dopen2(fid, sym_name, H5P_DEFAULT)) < 0)
+    if ((dsid = H5Dopen2(fid, sym_name, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Get the dataset's dataspace */
-    if((file_sid = H5Dget_space(dsid)) < 0)
+    if ((file_sid = H5Dget_space(dsid)) < 0)
         return -1;
 
     /* Get the number of elements (= records, for 1-D datasets) */
-    if((snpoints = H5Sget_simple_extent_npoints(file_sid)) < 0)
+    if ((snpoints = H5Sget_simple_extent_npoints(file_sid)) < 0)
         return -1;
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints);
 
     /* Check if there are records for symbol */
-    if(snpoints > 0) {
+    if (snpoints > 0) {
         /* Choose a random record in the dataset, choosing the last record half
          * the time */
         start[1] = (hsize_t)(HDrandom() % (snpoints * 2));
-        if(start[1] > (hsize_t)(snpoints - 1))
+        if (start[1] > (hsize_t)(snpoints - 1))
             start[1] = (hsize_t)(snpoints - 1);
-        if(H5Sselect_hyperslab(file_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
+        if (H5Sselect_hyperslab(file_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
             return -1;
 
-        /* Read record from dataset */
+            /* Read record from dataset */
 #ifdef FILLVAL_WORKS
         /* When shrinking the dataset, we cannot guarantee that the buffer will
          * even be touched, unless there is a fill value.  Since fill values do
          * not work with SWMR currently (see note in swmr_generator.c), we
          * simply initialize rec_id to 0. */
         record->rec_id = (uint64_t)ULLONG_MAX - 1;
-#else /* FILLVAL_WORKS */
+#else  /* FILLVAL_WORKS */
         record->rec_id = (uint64_t)0;
 #endif /* FILLVAL_WORKS */
-        if(H5Dread(dsid, symbol_tid, rec_sid, file_sid, H5P_DEFAULT, record) < 0)
+        if (H5Dread(dsid, symbol_tid, rec_sid, file_sid, H5P_DEFAULT, record) < 0)
             return -1;
 
         /* Verify record value - note that it may be the fill value, because the
          * chunk may be deleted before the object header has the updated
          * dimensions */
-        if(record->rec_id != start[1] && record->rec_id != (uint64_t)0) {
+        if (record->rec_id != start[1] && record->rec_id != (uint64_t)0) {
             HDfprintf(stderr, "*** ERROR ***\n");
             HDfprintf(stderr, "Incorrect record value!\n");
-            HDfprintf(stderr, "Symbol = '%s', # of records = %lld, record->rec_id = %llx\n", sym_name, (long long)snpoints, (unsigned long long)record->rec_id);
+            HDfprintf(stderr, "Symbol = '%s', # of records = %lld, record->rec_id = %llx\n", sym_name,
+                      (long long)snpoints, (unsigned long long)record->rec_id);
             return -1;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Close the dataset's dataspace */
-    if(H5Sclose(file_sid) < 0)
+    if (H5Sclose(file_sid) < 0)
         return -1;
 
     /* Close dataset for symbol */
-    if(H5Dclose(dsid) < 0)
+    if (H5Dclose(dsid) < 0)
         return -1;
 
     return 0;
 } /* end check_dataset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    read_records
  *
@@ -190,18 +187,18 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor
  *-------------------------------------------------------------------------
  */
 static int
-read_records(const char *filename, unsigned verbose, unsigned long nseconds,
-    unsigned poll_time, unsigned ncommon, unsigned nrandom)
+read_records(const char *filename, unsigned verbose, unsigned long nseconds, unsigned poll_time,
+             unsigned ncommon, unsigned nrandom)
 {
-    time_t start_time;          /* Starting time */
-    time_t curr_time;           /* Current time */
-    symbol_info_t **sym_com = NULL;     /* Pointers to array of common dataset IDs */
-    symbol_info_t **sym_rand = NULL;    /* Pointers to array of random dataset IDs */
-    hid_t mem_sid;              /* Memory dataspace ID */
-    hid_t fid;                  /* SWMR test file ID */
-    hid_t fapl;                 /* File access property list */
-    symbol_t record;            /* The record to add to the dataset */
-    unsigned v;                 /* Local index variable */
+    time_t          start_time;      /* Starting time */
+    time_t          curr_time;       /* Current time */
+    symbol_info_t **sym_com  = NULL; /* Pointers to array of common dataset IDs */
+    symbol_info_t **sym_rand = NULL; /* Pointers to array of random dataset IDs */
+    hid_t           mem_sid;         /* Memory dataspace ID */
+    hid_t           fid;             /* SWMR test file ID */
+    hid_t           fapl;            /* File access property list */
+    symbol_t        record;          /* The record to add to the dataset */
+    unsigned        v;               /* Local index variable */
 
     HDassert(filename);
     HDassert(nseconds != 0);
@@ -212,114 +209,114 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds,
     HDmemset(&record, 0, sizeof(record));
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "Choosing datasets\n");
 
     /* Allocate space for 'common' datasets, if any */
-    if(ncommon > 0) {
+    if (ncommon > 0) {
         /* Allocate array to hold pointers to symbols for common datasets */
-        if(NULL == (sym_com = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * ncommon)))
+        if (NULL == (sym_com = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * ncommon)))
             return -1;
 
         /* Open the common datasets */
-        for(v = 0; v < ncommon; v++) {
-            unsigned offset;                /* Offset of symbol to use */
+        for (v = 0; v < ncommon; v++) {
+            unsigned offset; /* Offset of symbol to use */
 
             /* Determine the offset of the symbol, within level 0 symbols */
             /* (level 0 symbols are the most common symbols) */
-            offset = (unsigned)HDrandom() % symbol_count[0];
+            offset     = (unsigned)HDrandom() % symbol_count[0];
             sym_com[v] = &symbol_info[0][offset];
 
             /* Emit informational message */
-            if(verbose)
+            if (verbose)
                 HDfprintf(stderr, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name);
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Allocate space for 'random' datasets, if any */
-    if(nrandom > 0) {
+    if (nrandom > 0) {
         /* Allocate array to hold pointers to symbols for random datasets */
-        if(NULL == (sym_rand = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * nrandom)))
+        if (NULL == (sym_rand = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * nrandom)))
             return -1;
 
         /* Determine the random datasets */
-        for(v = 0; v < nrandom; v++) {
-            symbol_info_t *sym;         /* Symbol to use */
+        for (v = 0; v < nrandom; v++) {
+            symbol_info_t *sym; /* Symbol to use */
 
             /* Determine the symbol, within all symbols */
-            if(NULL == (sym = choose_dataset(NULL, NULL)))
+            if (NULL == (sym = choose_dataset(NULL, NULL)))
                 return -1;
             sym_rand[v] = sym;
 
             /* Emit informational message */
-            if(verbose)
+            if (verbose)
                 HDfprintf(stderr, "Random symbol #%u = '%s'\n", v, sym->name);
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* Create a dataspace for the record to read */
-    if((mem_sid = H5Screate(H5S_SCALAR)) < 0)
+    if ((mem_sid = H5Screate(H5S_SCALAR)) < 0)
         return -1;
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "Reading records\n");
 
     /* Get the starting time */
     start_time = HDtime(NULL);
-    curr_time = start_time;
+    curr_time  = start_time;
 
     /* Create file access property list */
-    if((fapl = h5_fileaccess()) < 0)
+    if ((fapl = h5_fileaccess()) < 0)
         return -1;
 
     /* Loop over reading records until [at least] the correct # of seconds have passed */
-    while(curr_time < (time_t)(start_time + (time_t)nseconds)) {
+    while (curr_time < (time_t)(start_time + (time_t)nseconds)) {
 
         /* Emit informational message */
-        if(verbose)
-             HDfprintf(stderr, "Opening file: %s\n", filename);
+        if (verbose)
+            HDfprintf(stderr, "Opening file: %s\n", filename);
 
         /* Open the file */
-        if((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
+        if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
             return -1;
 
         /* Check 'common' datasets, if any */
-        if(ncommon > 0) {
+        if (ncommon > 0) {
             /* Emit informational message */
-            if(verbose)
+            if (verbose)
                 HDfprintf(stderr, "Checking common symbols\n");
 
             /* Iterate over common datasets */
-            for(v = 0; v < ncommon; v++) {
+            for (v = 0; v < ncommon; v++) {
                 /* Check common dataset */
-                if(check_dataset(fid, verbose, sym_com[v]->name, &record, mem_sid) < 0)
+                if (check_dataset(fid, verbose, sym_com[v]->name, &record, mem_sid) < 0)
                     return -1;
                 HDmemset(&record, 0, sizeof(record));
             } /* end for */
-        } /* end if */
+        }     /* end if */
 
         /* Check 'random' datasets, if any */
-        if(nrandom > 0) {
+        if (nrandom > 0) {
             /* Emit informational message */
-            if(verbose)
+            if (verbose)
                 HDfprintf(stderr, "Checking random symbols\n");
 
             /* Iterate over random datasets */
-            for(v = 0; v < nrandom; v++) {
+            for (v = 0; v < nrandom; v++) {
                 /* Check random dataset */
-                if(check_dataset(fid, verbose, sym_rand[v]->name, &record, mem_sid) < 0)
+                if (check_dataset(fid, verbose, sym_rand[v]->name, &record, mem_sid) < 0)
                     return -1;
                 HDmemset(&record, 0, sizeof(record));
             } /* end for */
-        } /* end if */
+        }     /* end if */
 
         /* Emit informational message */
-        if(verbose)
+        if (verbose)
             HDfprintf(stderr, "Closing file\n");
 
         /* Close the file */
-        if(H5Fclose(fid) < 0)
+        if (H5Fclose(fid) < 0)
             return -1;
 
         /* Sleep for the appropriate # of seconds */
@@ -330,25 +327,25 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds,
     } /* end while */
 
     /* Close the fapl */
-    if(H5Pclose(fapl) < 0)
+    if (H5Pclose(fapl) < 0)
         return -1;
 
     /* Close the memory dataspace */
-    if(H5Sclose(mem_sid) < 0)
+    if (H5Sclose(mem_sid) < 0)
         return -1;
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "Closing datasets\n");
 
     /* Close 'random' datasets, if any */
-    if(nrandom > 0) {
+    if (nrandom > 0) {
         /* Release array holding dataset ID's for random datasets */
         HDfree(sym_rand);
     } /* end if */
 
     /* Close 'common' datasets, if any */
-    if(ncommon > 0) {
+    if (ncommon > 0) {
         /* Release array holding dataset ID's for common datasets */
         HDfree(sym_com);
     } /* end if */
@@ -373,30 +370,31 @@ usage(void)
     HDexit(EXIT_FAILURE);
 }
 
-int main(int argc, const char *argv[])
+int
+main(int argc, const char *argv[])
 {
-    long nseconds = 0;      /* # of seconds to test */
-    int poll_time = 1;      /* # of seconds between polling */
-    int ncommon = 5;        /* # of common symbols to poll */
-    int nrandom = 10;       /* # of random symbols to poll */
-    unsigned verbose = 1;   /* Whether to emit some informational messages */
-    unsigned use_seed = 0;  /* Set to 1 if a seed was set on the command line */
-    unsigned random_seed = 0;   /* Random # seed */
-    unsigned u;             /* Local index variables */
-    int temp;
+    long     nseconds    = 0;  /* # of seconds to test */
+    int      poll_time   = 1;  /* # of seconds between polling */
+    int      ncommon     = 5;  /* # of common symbols to poll */
+    int      nrandom     = 10; /* # of random symbols to poll */
+    unsigned verbose     = 1;  /* Whether to emit some informational messages */
+    unsigned use_seed    = 0;  /* Set to 1 if a seed was set on the command line */
+    unsigned random_seed = 0;  /* Random # seed */
+    unsigned u;                /* Local index variables */
+    int      temp;
 
     /* Parse command line options */
-    if(argc < 2)
+    if (argc < 2)
         usage();
-    if(argc > 1) {
+    if (argc > 1) {
         u = 1;
-        while(u < (unsigned)argc) {
-            if(argv[u][0] == '-') {
-                switch(argv[u][1]) {
+        while (u < (unsigned)argc) {
+            if (argv[u][0] == '-') {
+                switch (argv[u][1]) {
                     /* # of common symbols to poll */
                     case 'h':
                         ncommon = HDatoi(argv[u + 1]);
-                        if(ncommon < 0)
+                        if (ncommon < 0)
                             usage();
                         u += 2;
                         break;
@@ -404,7 +402,7 @@ int main(int argc, const char *argv[])
                     /* # of random symbols to poll */
                     case 'l':
                         nrandom = HDatoi(argv[u + 1]);
-                        if(nrandom < 0)
+                        if (nrandom < 0)
                             usage();
                         u += 2;
                         break;
@@ -418,8 +416,8 @@ int main(int argc, const char *argv[])
                     /* Random # seed */
                     case 'r':
                         use_seed = 1;
-                        temp = HDatoi(argv[u + 1]);
-                        if(temp < 0)
+                        temp     = HDatoi(argv[u + 1]);
+                        if (temp < 0)
                             usage();
                         else
                             random_seed = (unsigned)temp;
@@ -429,7 +427,7 @@ int main(int argc, const char *argv[])
                     /* # of seconds between polling */
                     case 's':
                         poll_time = HDatoi(argv[u + 1]);
-                        if(poll_time < 0)
+                        if (poll_time < 0)
                             usage();
                         u += 2;
                         break;
@@ -438,24 +436,24 @@ int main(int argc, const char *argv[])
                         usage();
                         break;
                 } /* end switch */
-            } /* end if */
+            }     /* end if */
             else {
                 /* Get the number of records to append */
                 nseconds = HDatol(argv[u]);
-                if(nseconds <= 0)
+                if (nseconds <= 0)
                     usage();
 
                 u++;
             } /* end else */
-        } /* end while */
-    } /* end if */
-    if(nseconds <= 0)
+        }     /* end while */
+    }         /* end if */
+    if (nseconds <= 0)
         usage();
-    if(poll_time >= nseconds)
+    if (poll_time >= nseconds)
         usage();
 
     /* Emit informational message */
-    if(verbose) {
+    if (verbose) {
         HDfprintf(stderr, "Parameters:\n");
         HDfprintf(stderr, "\t# of seconds between polling = %d\n", poll_time);
         HDfprintf(stderr, "\t# of common symbols to poll = %d\n", ncommon);
@@ -464,7 +462,7 @@ int main(int argc, const char *argv[])
     } /* end if */
 
     /* Set the random seed */
-    if(0 == use_seed) {
+    if (0 == use_seed) {
         struct timeval t;
         HDgettimeofday(&t, NULL);
         random_seed = (unsigned)(t.tv_usec);
@@ -474,41 +472,42 @@ int main(int argc, const char *argv[])
     HDfprintf(stderr, "Using reader random seed: %u\n", random_seed);
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "Generating symbol names\n");
 
     /* Generate dataset names */
-    if(generate_symbols() < 0) {
+    if (generate_symbols() < 0) {
         HDfprintf(stderr, "Error generating symbol names!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Create datatype for creating datasets */
-    if((symbol_tid = create_symbol_datatype()) < 0)
+    if ((symbol_tid = create_symbol_datatype()) < 0)
         return -1;
 
     /* Reading records from datasets */
-    if(read_records(FILENAME, verbose, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) {
+    if (read_records(FILENAME, verbose, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon,
+                     (unsigned)nrandom) < 0) {
         HDfprintf(stderr, "Error reading records from datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "Releasing symbols\n");
 
     /* Clean up the symbols */
-    if(shutdown_symbols() < 0) {
+    if (shutdown_symbols() < 0) {
         HDfprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "Closing objects\n");
 
     /* Close objects created */
-    if(H5Tclose(symbol_tid) < 0) {
+    if (H5Tclose(symbol_tid) < 0) {
         HDfprintf(stderr, "Error closing symbol datatype!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */