Formats the source and updates the gcc warning pragmas

1 files changed, 93 insertions, 94 deletions

diff --git a/test/vfd_swmr_remove_writer.c b/test/vfd_swmr_remove_writer.c
index e8dd998..10de126 100644
--- a/test/vfd_swmr_remove_writer.c
+++ b/test/vfd_swmr_remove_writer.c
@@ -43,18 +43,16 @@
 /****************/
 
 /* The maximum number of records to remove in one step */
-#define MAX_REMOVE_SIZE     10
+#define MAX_REMOVE_SIZE 10
 
 /********************/
 /* Local Prototypes */
 /********************/
 
 static hid_t open_skeleton(const char *filename, unsigned verbose, unsigned old);
-static int remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks,
-    unsigned long flush_count);
-static void usage(void);
+static int   remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned long flush_count);
+static void  usage(void);
 
-
 /*-------------------------------------------------------------------------
  * Function:    open_skeleton
  *
@@ -74,81 +72,81 @@ static void usage(void);
  *-------------------------------------------------------------------------
  */
 static hid_t
-open_skeleton(const char *filename, unsigned verbose,
-    unsigned old H5_ATTR_UNUSED)
+open_skeleton(const char *filename, unsigned verbose, unsigned old H5_ATTR_UNUSED)
 {
-    hid_t fid = -1;     /* File ID for new HDF5 file */
-    hid_t fapl = -1;    /* File access property list */
-    hid_t sid = -1;     /* Dataspace ID */
-    hsize_t dim[2];     /* Dataspace dimensions */
-    unsigned u, v;      /* Local index variable */
-    H5F_vfd_swmr_config_t *config = NULL;   /* Configuration for VFD SWMR */
+    hid_t                  fid  = -1;     /* File ID for new HDF5 file */
+    hid_t                  fapl = -1;     /* File access property list */
+    hid_t                  sid  = -1;     /* Dataspace ID */
+    hsize_t                dim[2];        /* Dataspace dimensions */
+    unsigned               u, v;          /* Local index variable */
+    H5F_vfd_swmr_config_t *config = NULL; /* Configuration for VFD SWMR */
 
     HDassert(filename);
 
     /* Allocate memory for the configuration structure */
-    if((config = (H5F_vfd_swmr_config_t *)HDcalloc(1, sizeof(H5F_vfd_swmr_config_t))) == NULL)
+    if ((config = (H5F_vfd_swmr_config_t *)HDcalloc(1, sizeof(H5F_vfd_swmr_config_t))) == NULL)
         goto error;
 
     /* config, tick_len, max_lag, writer, flush_raw_data, md_pages_reserved, md_file_path */
-    init_vfd_swmr_config(config, 4, 5 , TRUE, FALSE, 128, "./rw-shadow");
+    init_vfd_swmr_config(config, 4, 5, TRUE, FALSE, 128, "./rw-shadow");
 
     /* use_latest_format, use_vfd_swmr, only_meta_page, config */
-    if((fapl = vfd_swmr_create_fapl(TRUE, TRUE, FALSE, config)) < 0)
+    if ((fapl = vfd_swmr_create_fapl(TRUE, TRUE, FALSE, config)) < 0)
         goto error;
 
     /* Open the file */
-    if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+    if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
         goto error;
 
     /* Close file access property list */
-    if(H5Pclose(fapl) < 0)
+    if (H5Pclose(fapl) < 0)
         goto error;
 
-    if(config)
+    if (config)
         HDfree(config);
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "WRITER: Opening datasets\n");
 
     /* Open the datasets */
-    for(u = 0; u < NLEVELS; u++)
-        for(v = 0; v < symbol_count[u]; v++) {
-            if((symbol_info[u][v].dsid = H5Dopen2(fid, symbol_info[u][v].name, H5P_DEFAULT)) < 0)
+    for (u = 0; u < NLEVELS; u++)
+        for (v = 0; v < symbol_count[u]; v++) {
+            if ((symbol_info[u][v].dsid = H5Dopen2(fid, symbol_info[u][v].name, H5P_DEFAULT)) < 0)
                 goto error;
-            if((sid = H5Dget_space(symbol_info[u][v].dsid)) < 0)
+            if ((sid = H5Dget_space(symbol_info[u][v].dsid)) < 0)
                 goto error;
-            if(2 != H5Sget_simple_extent_ndims(sid))
+            if (2 != H5Sget_simple_extent_ndims(sid))
                 goto error;
-            if(H5Sget_simple_extent_dims(sid, dim, NULL) < 0)
+            if (H5Sget_simple_extent_dims(sid, dim, NULL) < 0)
                 goto error;
             symbol_info[u][v].nrecords = dim[1];
 
-            if(H5Sclose(sid) < 0)
+            if (H5Sclose(sid) < 0)
                 goto error;
         } /* end for */
 
     return fid;
 
-error: 
-    if(config)
+error:
+    if (config)
         HDfree(config);
 
-    H5E_BEGIN_TRY {
-        for(u = 0; u < NLEVELS; u++)
-            for(v = 0; v < symbol_count[u]; v++)
+    H5E_BEGIN_TRY
+    {
+        for (u = 0; u < NLEVELS; u++)
+            for (v = 0; v < symbol_count[u]; v++)
                 H5Dclose(symbol_info[u][v].dsid);
         H5Sclose(sid);
         H5Pclose(fapl);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return -1;
 
 } /* open_skeleton() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    remove_records
  *
@@ -175,63 +173,64 @@ error:
 static int
 remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned long flush_count)
 {
-    unsigned long shrink_to_flush;      /* # of removals before flush */
-    hsize_t dim[2] = {1,0};             /* Dataspace dimensions */
-    unsigned long u, v;                 /* Local index variables */
+    unsigned long shrink_to_flush; /* # of removals before flush */
+    hsize_t       dim[2] = {1, 0}; /* Dataspace dimensions */
+    unsigned long u, v;            /* Local index variables */
 
     HDassert(fid >= 0);
 
     /* Remove records from random datasets, according to frequency distribution */
     shrink_to_flush = flush_count;
-    for(u = 0; u < nshrinks; u++) {
-        symbol_info_t *symbol;  /* Symbol to remove record from */
-        hsize_t remove_size;    /* Size to reduce dataset dimension by */
+    for (u = 0; u < nshrinks; u++) {
+        symbol_info_t *symbol;      /* Symbol to remove record from */
+        hsize_t        remove_size; /* Size to reduce dataset dimension by */
 
         /* Get a random dataset, according to the symbol distribution */
         symbol = choose_dataset(NULL, NULL);
 
         /* Shrink the dataset's dataspace */
         remove_size = (hsize_t)HDrandom() % MAX_REMOVE_SIZE + 1;
-        if(remove_size > symbol->nrecords)
+        if (remove_size > symbol->nrecords)
             symbol->nrecords = 0;
         else
             symbol->nrecords -= remove_size;
         dim[1] = symbol->nrecords;
-        if(H5Dset_extent(symbol->dsid, dim) < 0)
+        if (H5Dset_extent(symbol->dsid, dim) < 0)
             goto error;
 
         /* Check for flushing file */
-        if(flush_count > 0) {
+        if (flush_count > 0) {
             /* Decrement count of records to write before flushing */
             shrink_to_flush--;
 
             /* Check for counter being reached */
-            if(0 == shrink_to_flush) {
+            if (0 == shrink_to_flush) {
                 /* Reset flush counter */
                 shrink_to_flush = flush_count;
             } /* end if */
-        } /* end if */
-    } /* end for */
+        }     /* end if */
+    }         /* end for */
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "WRITER: Closing datasets\n");
 
     /* Close the datasets */
-    for(u = 0; u < NLEVELS; u++)
-        for(v = 0; v < symbol_count[u]; v++)
-            if(H5Dclose(symbol_info[u][v].dsid) < 0)
+    for (u = 0; u < NLEVELS; u++)
+        for (v = 0; v < symbol_count[u]; v++)
+            if (H5Dclose(symbol_info[u][v].dsid) < 0)
                 goto error;
 
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-        for(u = 0; u < NLEVELS; u++)
-            for(v = 0; v < symbol_count[u]; v++)
+    H5E_BEGIN_TRY
+    {
+        for (u = 0; u < NLEVELS; u++)
+            for (v = 0; v < symbol_count[u]; v++)
                 H5Dclose(symbol_info[u][v].dsid);
-
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return -1;
 } /* remove_records() */
@@ -254,33 +253,34 @@ usage(void)
     HDexit(1);
 } /* usage() */
 
-int main(int argc, const char *argv[])
+int
+main(int argc, const char *argv[])
 {
     sigset_t oldset;
-    hid_t fid;                  /* File ID for file opened */
-    long nshrinks = 0;          /* # of times to shrink the dataset */
-    long flush_count = 1000;    /* # of records to write between flushing file */
-    unsigned verbose = 1;       /* Whether to emit some informational messages */
-    unsigned old = 0;           /* Whether to use non-latest-format when opening file */
-    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 variable */
-    int temp;
+    hid_t    fid;                /* File ID for file opened */
+    long     nshrinks    = 0;    /* # of times to shrink the dataset */
+    long     flush_count = 1000; /* # of records to write between flushing file */
+    unsigned verbose     = 1;    /* Whether to emit some informational messages */
+    unsigned old         = 0;    /* Whether to use non-latest-format when opening file */
+    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 variable */
+    int      temp;
 
     block_signals(&oldset);
 
     /* 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 records to write between flushing file */
                     case 'f':
                         flush_count = HDatol(argv[u + 1]);
-                        if(flush_count < 0)
+                        if (flush_count < 0)
                             usage();
                         u += 2;
                         break;
@@ -290,11 +290,11 @@ int main(int argc, const char *argv[])
                         verbose = 0;
                         u++;
                         break;
-                    
+
                     /* Random # seed */
                     case 'r':
-                        use_seed = 1;
-                        temp = HDatoi(argv[u + 1]);
+                        use_seed    = 1;
+                        temp        = HDatoi(argv[u + 1]);
                         random_seed = (unsigned)temp;
                         u += 2;
                         break;
@@ -309,31 +309,31 @@ int main(int argc, const char *argv[])
                         usage();
                         break;
                 } /* end switch */
-            } /* end if */
+            }     /* end if */
             else {
                 /* Get the number of records to append */
                 nshrinks = HDatol(argv[u]);
-                if(nshrinks <= 0)
+                if (nshrinks <= 0)
                     usage();
 
                 u++;
             } /* end else */
-        } /* end while */
-    } /* end if */
-    if(nshrinks <= 0)
+        }     /* end while */
+    }         /* end if */
+    if (nshrinks <= 0)
         usage();
-    if(flush_count >= nshrinks)
+    if (flush_count >= nshrinks)
         usage();
 
     /* Emit informational message */
-    if(verbose) {
+    if (verbose) {
         HDfprintf(stderr, "WRITER: Parameters:\n");
         HDfprintf(stderr, "\t# of shrinks between flushes = %ld\n", flush_count);
         HDfprintf(stderr, "\t# of shrinks = %ld\n", nshrinks);
     } /* 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);
@@ -343,21 +343,20 @@ int main(int argc, const char *argv[])
     HDfprintf(stderr, "WRITER: Using writer random seed: %u\n", random_seed);
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "WRITER: Generating symbol names\n");
 
     /* Generate dataset names */
-    if(generate_symbols() < 0)
+    if (generate_symbols() < 0)
         return -1;
 
     /* Emit informational message */
-    if(verbose) {
-        HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n",
-            VFD_SWMR_FILENAME);
+    if (verbose) {
+        HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", VFD_SWMR_FILENAME);
     }
 
     /* Open file skeleton */
-    if((fid = open_skeleton(VFD_SWMR_FILENAME, verbose, old)) < 0) {
+    if ((fid = open_skeleton(VFD_SWMR_FILENAME, verbose, old)) < 0) {
         HDfprintf(stderr, "WRITER: Error opening skeleton file!\n");
         HDexit(1);
     } /* end if */
@@ -366,21 +365,21 @@ int main(int argc, const char *argv[])
     h5_send_message(VFD_SWMR_WRITER_MESSAGE, NULL, NULL);
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "WRITER: Removing records\n");
 
     /* Remove records from datasets */
-    if(remove_records(fid, verbose, (unsigned long)nshrinks, (unsigned long)flush_count) < 0) {
+    if (remove_records(fid, verbose, (unsigned long)nshrinks, (unsigned long)flush_count) < 0) {
         HDfprintf(stderr, "WRITER: Error removing records from datasets!\n");
         HDexit(1);
     } /* end if */
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "WRITER: Releasing symbols\n");
 
     /* Clean up the symbols */
-    if(shutdown_symbols() < 0) {
+    if (shutdown_symbols() < 0) {
         HDfprintf(stderr, "WRITER: Error releasing symbols!\n");
         HDexit(1);
     } /* end if */
@@ -390,11 +389,11 @@ int main(int argc, const char *argv[])
     restore_signals(&oldset);
 
     /* Emit informational message */
-    if(verbose)
+    if (verbose)
         HDfprintf(stderr, "WRITER: Closing objects\n");
 
     /* Close objects opened */
-    if(H5Fclose(fid) < 0) {
+    if (H5Fclose(fid) < 0) {
         HDfprintf(stderr, "WRITER: Error closing file!\n");
         HDexit(1);
     } /* end if */