Clang-format of source files

2 files changed, 227 insertions, 287 deletions

diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 8b61112..d77767a 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -19,36 +19,29 @@
 /* Name of tool */
 #define PROGRAMNAME "h5jam"
 
-herr_t write_pad(int ofile, hsize_t old_where, hsize_t *new_where);
-hsize_t compute_user_block_size (hsize_t);
-hsize_t copy_some_to_file (int, int, hsize_t, hsize_t, ssize_t);
-void parse_command_line (int, const char *[]);
+herr_t  write_pad(int ofile, hsize_t old_where, hsize_t *new_where);
+hsize_t compute_user_block_size(hsize_t);
+hsize_t copy_some_to_file(int, int, hsize_t, hsize_t, ssize_t);
+void    parse_command_line(int, const char *[]);
 
-int do_clobber = FALSE;
+int   do_clobber  = FALSE;
 char *output_file = NULL;
-char *input_file = NULL;
-char *ub_file = NULL;
+char *input_file  = NULL;
+char *ub_file     = NULL;
 
 /*
  * Command-line options: The user can specify short or long-named
  * parameters. The long-named ones can be partially spelled. When
  * adding more, make sure that they don't clash with each other.
  */
-static const char *s_opts = "hi:u:o:c:V";  /* add more later ? */
+static const char *        s_opts   = "hi:u:o:c:V"; /* add more later ? */
 static struct long_options l_opts[] = {
-  {"help", no_arg, 'h'},
-  {"hel", no_arg, 'h'},
-  {"i", require_arg, 'i'},  /* input file */
-  {"u", require_arg, 'u'},  /* user block file */
-  {"o", require_arg, 'o'},  /* output file */
-  {"clobber", no_arg, 'c'},  /* clobber existing UB */
-  {"clobbe", no_arg, 'c'},
-  {"clobb", no_arg, 'c'},
-  {"clob", no_arg, 'c'},
-  {"clo", no_arg, 'c'},
-  {"cl", no_arg, 'c'},
-  {NULL, 0, '\0'}
-};
+    {"help", no_arg, 'h'},    {"hel", no_arg, 'h'},   {"i", require_arg, 'i'}, /* input file */
+    {"u", require_arg, 'u'},                                                   /* user block file */
+    {"o", require_arg, 'o'},                                                   /* output file */
+    {"clobber", no_arg, 'c'},                                                  /* clobber existing UB */
+    {"clobbe", no_arg, 'c'},  {"clobb", no_arg, 'c'}, {"clob", no_arg, 'c'},
+    {"clo", no_arg, 'c'},     {"cl", no_arg, 'c'},    {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function:    usage
@@ -59,56 +52,35 @@ static struct long_options l_opts[] = {
  *-------------------------------------------------------------------------
  */
 static void
-usage (const char *prog)
+usage(const char *prog)
 {
-    HDfflush (stdout);
-    HDfprintf (stdout,
-    "usage: %s -i <in_file.h5> -u <in_user_file> [-o <out_file.h5>] [--clobber]\n", prog);
-    HDfprintf (stdout, "\n");
-    HDfprintf (stdout,
-    "Adds user block to front of an HDF5 file and creates a new concatenated file.\n");
-    HDfprintf (stdout, "\n");
-    HDfprintf (stdout,
-    "OPTIONS\n");
-    HDfprintf (stdout,
-    "  -i in_file.h5    Specifies the input HDF5 file.\n");
-    HDfprintf (stdout,
-    "  -u in_user_file  Specifies the file to be inserted into the user block.\n");
-    HDfprintf (stdout,
-    "                   Can be any file format except an HDF5 format.\n");
-    HDfprintf (stdout,
-    "  -o out_file.h5   Specifies the output HDF5 file.\n");
-    HDfprintf (stdout,
-    "                   If not specified, the user block will be concatenated in\n");
-    HDfprintf (stdout,
-    "                   place to the input HDF5 file.\n");
-    HDfprintf (stdout,
-    "  --clobber        Wipes out any existing user block before concatenating\n");
-    HDfprintf (stdout,
-    "                   the given user block.\n");
-    HDfprintf (stdout,
-    "                   The size of the new user block will be the larger of;\n");
-    HDfprintf (stdout,
-    "                    - the size of existing user block in the input HDF5 file\n");
-    HDfprintf (stdout,
-    "                    - the size of user block required by new input user file\n");
-    HDfprintf (stdout,
-    "                   (size = 512 x 2N,  N is positive integer.)\n");
-    HDfprintf (stdout, "\n");
-    HDfprintf (stdout,
-    "  -h               Prints a usage message and exits.\n");
-    HDfprintf (stdout,
-    "  -V               Prints the HDF5 library version and exits.\n");
-    HDfprintf (stdout, "\n");
-    HDfprintf (stdout,
-    "Exit Status:\n");
-    HDfprintf (stdout,
-    "   0   Succeeded.\n");
-    HDfprintf (stdout,
-    "   >0  An error occurred.\n");
+    HDfflush(stdout);
+    HDfprintf(stdout, "usage: %s -i <in_file.h5> -u <in_user_file> [-o <out_file.h5>] [--clobber]\n", prog);
+    HDfprintf(stdout, "\n");
+    HDfprintf(stdout, "Adds user block to front of an HDF5 file and creates a new concatenated file.\n");
+    HDfprintf(stdout, "\n");
+    HDfprintf(stdout, "OPTIONS\n");
+    HDfprintf(stdout, "  -i in_file.h5    Specifies the input HDF5 file.\n");
+    HDfprintf(stdout, "  -u in_user_file  Specifies the file to be inserted into the user block.\n");
+    HDfprintf(stdout, "                   Can be any file format except an HDF5 format.\n");
+    HDfprintf(stdout, "  -o out_file.h5   Specifies the output HDF5 file.\n");
+    HDfprintf(stdout, "                   If not specified, the user block will be concatenated in\n");
+    HDfprintf(stdout, "                   place to the input HDF5 file.\n");
+    HDfprintf(stdout, "  --clobber        Wipes out any existing user block before concatenating\n");
+    HDfprintf(stdout, "                   the given user block.\n");
+    HDfprintf(stdout, "                   The size of the new user block will be the larger of;\n");
+    HDfprintf(stdout, "                    - the size of existing user block in the input HDF5 file\n");
+    HDfprintf(stdout, "                    - the size of user block required by new input user file\n");
+    HDfprintf(stdout, "                   (size = 512 x 2N,  N is positive integer.)\n");
+    HDfprintf(stdout, "\n");
+    HDfprintf(stdout, "  -h               Prints a usage message and exits.\n");
+    HDfprintf(stdout, "  -V               Prints the HDF5 library version and exits.\n");
+    HDfprintf(stdout, "\n");
+    HDfprintf(stdout, "Exit Status:\n");
+    HDfprintf(stdout, "   0   Succeeded.\n");
+    HDfprintf(stdout, "   >0  An error occurred.\n");
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    leave
  *
@@ -136,40 +108,38 @@ leave(int ret)
  */
 
 void
-parse_command_line (int argc, const char *argv[])
+parse_command_line(int argc, const char *argv[])
 {
-  int opt = FALSE;
-
-  /* parse command line options */
-  while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
-    {
-      switch ((char) opt)
-      {
-      case 'o':
-          output_file = HDstrdup (opt_arg);
-          break;
-      case 'i':
-          input_file = HDstrdup (opt_arg);
-          break;
-      case 'u':
-          ub_file = HDstrdup (opt_arg);
-          break;
-      case 'c':
-          do_clobber = TRUE;
-          break;
-      case 'h':
-          usage (h5tools_getprogname());
-          leave (EXIT_SUCCESS);
-          break;
-      case 'V':
-          print_version (h5tools_getprogname());
-          leave (EXIT_SUCCESS);
-          break;
-      case '?':
-      default:
-          usage (h5tools_getprogname());
-          leave (EXIT_FAILURE);
-      }
+    int opt = FALSE;
+
+    /* parse command line options */
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+        switch ((char)opt) {
+            case 'o':
+                output_file = HDstrdup(opt_arg);
+                break;
+            case 'i':
+                input_file = HDstrdup(opt_arg);
+                break;
+            case 'u':
+                ub_file = HDstrdup(opt_arg);
+                break;
+            case 'c':
+                do_clobber = TRUE;
+                break;
+            case 'h':
+                usage(h5tools_getprogname());
+                leave(EXIT_SUCCESS);
+                break;
+            case 'V':
+                print_version(h5tools_getprogname());
+                leave(EXIT_SUCCESS);
+                break;
+            case '?':
+            default:
+                usage(h5tools_getprogname());
+                leave(EXIT_FAILURE);
+        }
     }
 }
 
@@ -183,24 +153,24 @@ parse_command_line (int argc, const char *argv[])
  *-------------------------------------------------------------------------
  */
 int
-main (int argc, const char *argv[])
+main(int argc, const char *argv[])
 {
-    int         ufid = -1;
-    int         h5fid = -1;
-    int         ofid = -1;
-    hid_t       ifile = H5I_INVALID_HID;
-    hid_t       plist = H5I_INVALID_HID;
-    herr_t      status;
-    htri_t      testval;
-    hsize_t     usize;
-    hsize_t     h5fsize;
-    hsize_t     startub;
-    hsize_t     where;
-    hsize_t     newubsize;
-    off_t       fsize;
-    h5_stat_t   sbuf;
-    h5_stat_t   sbuf2;
-    int         res;
+    int       ufid  = -1;
+    int       h5fid = -1;
+    int       ofid  = -1;
+    hid_t     ifile = H5I_INVALID_HID;
+    hid_t     plist = H5I_INVALID_HID;
+    herr_t    status;
+    htri_t    testval;
+    hsize_t   usize;
+    hsize_t   h5fsize;
+    hsize_t   startub;
+    hsize_t   where;
+    hsize_t   newubsize;
+    off_t     fsize;
+    h5_stat_t sbuf;
+    h5_stat_t sbuf2;
+    int       res;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -274,14 +244,14 @@ main (int argc, const char *argv[])
     ifile = H5I_INVALID_HID;
 
     ufid = HDopen(ub_file, O_RDONLY);
-    if(ufid < 0) {
+    if (ufid < 0) {
         error_msg("unable to open user block file \"%s\"\n", ub_file);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
 
     res = HDfstat(ufid, &sbuf);
-    if(res < 0) {
+    if (res < 0) {
         error_msg("Can't stat file \"%s\"\n", ub_file);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
@@ -290,14 +260,14 @@ main (int argc, const char *argv[])
     fsize = (off_t)sbuf.st_size;
 
     h5fid = HDopen(input_file, O_RDONLY);
-    if(h5fid < 0) {
+    if (h5fid < 0) {
         error_msg("unable to open HDF5 file for read \"%s\"\n", input_file);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
 
     res = HDfstat(h5fid, &sbuf2);
-    if(res < 0) {
+    if (res < 0) {
         error_msg("Can't stat file \"%s\"\n", input_file);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
@@ -324,7 +294,7 @@ main (int argc, const char *argv[])
         }
     }
 
-    newubsize = compute_user_block_size((hsize_t) fsize);
+    newubsize = compute_user_block_size((hsize_t)fsize);
 
     startub = usize;
 
@@ -334,53 +304,53 @@ main (int argc, const char *argv[])
             if (usize > newubsize) {
                 newubsize = usize;
             }
-            startub = 0;    /*blast the old */
+            startub = 0; /*blast the old */
         }
         else {
             /* add new ub to current ublock, pad to new offset */
             newubsize += usize;
-            newubsize = compute_user_block_size((hsize_t) newubsize);
+            newubsize = compute_user_block_size((hsize_t)newubsize);
         }
     }
 
     /* copy the HDF5 from starting at usize to starting at newubsize:
      *  makes room at 'from' for new ub */
     /* if no current ub, usize is 0 */
-    copy_some_to_file(h5fid, ofid, usize, newubsize, (ssize_t) (h5fsize - usize));
+    copy_some_to_file(h5fid, ofid, usize, newubsize, (ssize_t)(h5fsize - usize));
 
     /* copy the old ub to the beginning of the new file */
     if (!do_clobber) {
-        where = copy_some_to_file(h5fid, ofid, (hsize_t) 0, (hsize_t) 0, (ssize_t) usize);
+        where = copy_some_to_file(h5fid, ofid, (hsize_t)0, (hsize_t)0, (ssize_t)usize);
     }
 
     /* copy the new ub to the end of the ub */
-    where = copy_some_to_file(ufid, ofid, (hsize_t) 0, startub, (ssize_t) - 1);
+    where = copy_some_to_file(ufid, ofid, (hsize_t)0, startub, (ssize_t)-1);
 
     /* pad the ub */
-    if(write_pad(ofid, where, &where) < 0) {
+    if (write_pad(ofid, where, &where) < 0) {
         error_msg("Can't pad file \"%s\"\n", output_file);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     } /* end if */
 
 done:
-    if(ub_file)
+    if (ub_file)
         HDfree(ub_file);
-    if(input_file)
+    if (input_file)
         HDfree(input_file);
-    if(output_file)
+    if (output_file)
         HDfree(output_file);
 
-    if(plist >= 0)
+    if (plist >= 0)
         H5Pclose(plist);
-    if(ifile >= 0)
+    if (ifile >= 0)
         H5Fclose(ifile);
 
-    if(ufid >= 0)
+    if (ufid >= 0)
         HDclose(ufid);
-    if(h5fid >= 0)
+    if (h5fid >= 0)
         HDclose(h5fid);
-    if(ofid >= 0)
+    if (ofid >= 0)
         HDclose(ofid);
 
     leave(h5tools_getstatus());
@@ -407,29 +377,28 @@ done:
  *-------------------------------------------------------------------------
  */
 hsize_t
-copy_some_to_file(int infid, int outfid, hsize_t startin, hsize_t startout,
-       ssize_t limit)
+copy_some_to_file(int infid, int outfid, hsize_t startin, hsize_t startout, ssize_t limit)
 {
-    char buf[1024];
+    char      buf[1024];
     h5_stat_t sbuf;
-    int res;
-    ssize_t tot = 0;
-    ssize_t howmuch = 0;
-    ssize_t nchars = -1;
-    ssize_t to;
-    ssize_t from;
-    ssize_t toend;
-    ssize_t fromend;
-
-    if(startin > startout) {
+    int       res;
+    ssize_t   tot     = 0;
+    ssize_t   howmuch = 0;
+    ssize_t   nchars  = -1;
+    ssize_t   to;
+    ssize_t   from;
+    ssize_t   toend;
+    ssize_t   fromend;
+
+    if (startin > startout) {
         /* this case is prohibited */
         error_msg("copy_some_to_file: panic: startin > startout?\n");
-        exit (EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
-    if(limit < 0) {
+    if (limit < 0) {
         res = HDfstat(infid, &sbuf);
-        if(res < 0) {
+        if (res < 0) {
             error_msg("Can't stat file \n");
             HDexit(EXIT_FAILURE);
         } /* end if */
@@ -440,27 +409,27 @@ copy_some_to_file(int infid, int outfid, hsize_t startin, hsize_t startout,
         howmuch = limit;
     } /* end if */
 
-    if(0 == howmuch)
+    if (0 == howmuch)
         return 0;
 
-    toend = (ssize_t) startout + howmuch;
-    fromend = (ssize_t) startin + howmuch;
+    toend   = (ssize_t)startout + howmuch;
+    fromend = (ssize_t)startin + howmuch;
 
     if (howmuch > 512) {
-        to = toend - 512;
+        to   = toend - 512;
         from = fromend - 512;
     }
     else {
-        to = toend - howmuch;
+        to   = toend - howmuch;
         from = fromend - howmuch;
     } /* end if */
 
     while (howmuch > 0) {
-        HDlseek(outfid, (off_t) to, SEEK_SET);
-        HDlseek(infid, (off_t) from, SEEK_SET);
+        HDlseek(outfid, (off_t)to, SEEK_SET);
+        HDlseek(infid, (off_t)from, SEEK_SET);
 
         if (howmuch > 512) {
-            nchars = HDread(infid, buf, (unsigned) 512);
+            nchars = HDread(infid, buf, (unsigned)512);
         }
         else {
             nchars = HDread(infid, buf, (unsigned)howmuch);
@@ -471,14 +440,14 @@ copy_some_to_file(int infid, int outfid, hsize_t startin, hsize_t startout,
             HDexit(EXIT_FAILURE);
         } /* end if */
 
-        if(HDwrite (outfid, buf, (unsigned) nchars) < 0) {
+        if (HDwrite(outfid, buf, (unsigned)nchars) < 0) {
             error_msg("Write error \n");
             HDexit(EXIT_FAILURE);
         }
 
         tot += nchars;
         howmuch -= nchars;
-        if(howmuch > 512) {
+        if (howmuch > 512) {
             to -= nchars;
             from -= nchars;
         }
@@ -486,12 +455,11 @@ copy_some_to_file(int infid, int outfid, hsize_t startin, hsize_t startout,
             to -= howmuch;
             from -= howmuch;
         } /* end if */
-    } /* end while */
+    }     /* end while */
 
     return (hsize_t)tot + (hsize_t)startout;
 } /* end copy_some_to_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    compute_user_block_size
  *
@@ -508,10 +476,10 @@ compute_user_block_size(hsize_t ublock_size)
 {
     hsize_t where = 512;
 
-    if(0 == ublock_size)
+    if (0 == ublock_size)
         return 0;
 
-    while(where < ublock_size)
+    while (where < ublock_size)
         where *= 2;
 
     return where;
@@ -528,10 +496,10 @@ herr_t
 write_pad(int ofile, hsize_t old_where, hsize_t *new_where)
 {
     unsigned int i;
-    char buf[1];
-    hsize_t psize;
+    char         buf[1];
+    hsize_t      psize;
 
-    if(new_where == NULL)
+    if (new_where == NULL)
         return FAIL;
 
     buf[0] = '\0';
@@ -541,8 +509,8 @@ write_pad(int ofile, hsize_t old_where, hsize_t *new_where)
     psize = compute_user_block_size(old_where);
     psize -= old_where;
 
-    for(i = 0; i < psize; i++)
-        if(HDwrite(ofile, buf, 1) < 0)
+    for (i = 0; i < psize; i++)
+        if (HDwrite(ofile, buf, 1) < 0)
             return FAIL;
 
     /* Set the new size of the file. */
@@ -550,4 +518,3 @@ write_pad(int ofile, hsize_t old_where, hsize_t *new_where)
 
     return SUCCEED;
 } /* end write_pad() */
-
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index b48e2c1..d02cada 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -21,34 +21,28 @@
 
 #define COPY_BUF_SIZE 1024
 
-hsize_t write_pad( int , hsize_t );
-hsize_t compute_pad( hsize_t );
-herr_t copy_to_file( FILE *, FILE * , ssize_t, ssize_t );
+hsize_t write_pad(int, hsize_t);
+hsize_t compute_pad(hsize_t);
+herr_t  copy_to_file(FILE *, FILE *, ssize_t, ssize_t);
 
-int do_delete = FALSE;
+int   do_delete   = FALSE;
 char *output_file = NULL;
-char *input_file = NULL;
-char *ub_file = NULL;
+char *input_file  = NULL;
+char *ub_file     = NULL;
 
 /*
  * Command-line options: The user can specify short or long-named
  * parameters. The long-named ones can be partially spelled. When
  * adding more, make sure that they don't clash with each other.
  */
-static const char *s_opts = "hu:i:o:d:V";
+static const char *        s_opts   = "hu:i:o:d:V";
 static struct long_options l_opts[] = {
-    { "help", no_arg, 'h' },
-    { "hel", no_arg, 'h' },
-    {"i", require_arg, 'i'},    /* input file */
-    {"u", require_arg, 'u'},    /* user block file */
-    {"o", require_arg, 'o'},    /* output file */
-    {"delete", no_arg, 'd'},    /* delete ub */
-    {"delet", no_arg, 'd'},
-    {"dele", no_arg, 'd'},
-    {"del", no_arg, 'd'},
-    {"de", no_arg, 'd'},
-    { NULL, 0, '\0' }
-};
+    {"help", no_arg, 'h'},   {"hel", no_arg, 'h'},  {"i", require_arg, 'i'}, /* input file */
+    {"u", require_arg, 'u'},                                                 /* user block file */
+    {"o", require_arg, 'o'},                                                 /* output file */
+    {"delete", no_arg, 'd'},                                                 /* delete ub */
+    {"delet", no_arg, 'd'},  {"dele", no_arg, 'd'}, {"del", no_arg, 'd'},
+    {"de", no_arg, 'd'},     {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function:    usage
@@ -62,55 +56,34 @@ static void
 usage(const char *prog)
 {
     HDfflush(stdout);
-    HDfprintf(stdout,
-    "usage: %s -i <in_file.h5>  [-o <out_file.h5> ] [-u <out_user_file> | --delete]\n", prog);
+    HDfprintf(stdout, "usage: %s -i <in_file.h5>  [-o <out_file.h5> ] [-u <out_user_file> | --delete]\n",
+              prog);
     HDfprintf(stdout, "\n");
-    HDfprintf(stdout,
-    "Splits user file and HDF5 file into two files: user block data and HDF5 data.\n");
+    HDfprintf(stdout, "Splits user file and HDF5 file into two files: user block data and HDF5 data.\n");
     HDfprintf(stdout, "\n");
-    HDfprintf(stdout,
-    "OPTIONS\n");
-    HDfprintf(stdout,
-    "  -i in_file.h5   Specifies the HDF5 as input.  If the input HDF5 file\n");
-    HDfprintf(stdout,
-    "                  contains no user block, exit with an error message.\n");
-    HDfprintf(stdout,
-    "  -o out_file.h5  Specifies output HDF5 file without a user block.\n");
-    HDfprintf(stdout,
-    "                  If not specified, the user block will be removed from the\n");
-    HDfprintf(stdout,
-    "                  input HDF5 file.\n");
-    HDfprintf(stdout,
-    "  -u out_user_file\n");
-    HDfprintf(stdout,
-    "                  Specifies the output file containing the data from the\n");
-    HDfprintf(stdout,
-    "                  user block.\n");
-    HDfprintf(stdout,
-    "                  Cannot be used with --delete option.\n");
-    HDfprintf(stdout,
-    "  --delete        Remove the user block from the input HDF5 file. The content\n");
-    HDfprintf(stdout,
-    "                  of the user block is discarded.\n");
-    HDfprintf(stdout,
-    "                  Cannot be used with the -u option.\n");
+    HDfprintf(stdout, "OPTIONS\n");
+    HDfprintf(stdout, "  -i in_file.h5   Specifies the HDF5 as input.  If the input HDF5 file\n");
+    HDfprintf(stdout, "                  contains no user block, exit with an error message.\n");
+    HDfprintf(stdout, "  -o out_file.h5  Specifies output HDF5 file without a user block.\n");
+    HDfprintf(stdout, "                  If not specified, the user block will be removed from the\n");
+    HDfprintf(stdout, "                  input HDF5 file.\n");
+    HDfprintf(stdout, "  -u out_user_file\n");
+    HDfprintf(stdout, "                  Specifies the output file containing the data from the\n");
+    HDfprintf(stdout, "                  user block.\n");
+    HDfprintf(stdout, "                  Cannot be used with --delete option.\n");
+    HDfprintf(stdout, "  --delete        Remove the user block from the input HDF5 file. The content\n");
+    HDfprintf(stdout, "                  of the user block is discarded.\n");
+    HDfprintf(stdout, "                  Cannot be used with the -u option.\n");
     HDfprintf(stdout, "\n");
-    HDfprintf(stdout,
-    "  -h              Prints a usage message and exits.\n");
-    HDfprintf(stdout,
-    "  -V              Prints the HDF5 library version and exits.\n");
+    HDfprintf(stdout, "  -h              Prints a usage message and exits.\n");
+    HDfprintf(stdout, "  -V              Prints the HDF5 library version and exits.\n");
     HDfprintf(stdout, "\n");
-    HDfprintf(stdout,
-    "  If neither --delete nor -u is specified, the user block from the input file\n");
-    HDfprintf(stdout,
-    "  will be displayed to stdout.\n");
+    HDfprintf(stdout, "  If neither --delete nor -u is specified, the user block from the input file\n");
+    HDfprintf(stdout, "  will be displayed to stdout.\n");
     HDfprintf(stdout, "\n");
-    HDfprintf(stdout,
-    "Exit Status:\n");
-    HDfprintf(stdout,
-    "  0      Succeeded.\n");
-    HDfprintf(stdout,
-    "  >0    An error occurred.\n");
+    HDfprintf(stdout, "Exit Status:\n");
+    HDfprintf(stdout, "  0      Succeeded.\n");
+    HDfprintf(stdout, "  >0    An error occurred.\n");
 }
 
 /*-------------------------------------------------------------------------
@@ -127,9 +100,9 @@ parse_command_line(int argc, const char *argv[])
 {
     int opt = FALSE;
 
-   /* parse command line options */
+    /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-        switch((char)opt) {
+        switch ((char)opt) {
             case 'o':
                 output_file = HDstrdup(opt_arg);
                 if (output_file)
@@ -140,7 +113,8 @@ parse_command_line(int argc, const char *argv[])
                 input_file = HDstrdup(opt_arg);
                 if (input_file)
                     h5tools_set_input_file(input_file, 1);
-                break;;
+                break;
+                ;
 
             case 'u':
                 ub_file = HDstrdup(opt_arg);
@@ -160,7 +134,7 @@ parse_command_line(int argc, const char *argv[])
                 goto done;
 
             case 'V':
-                print_version (h5tools_getprogname());
+                print_version(h5tools_getprogname());
                 h5tools_setstatus(EXIT_SUCCESS);
                 goto done;
 
@@ -175,11 +149,11 @@ parse_command_line(int argc, const char *argv[])
     return EXIT_SUCCESS;
 
 done:
-    if(input_file)
+    if (input_file)
         HDfree(input_file);
-    if(output_file)
+    if (output_file)
         HDfree(output_file);
-    if(ub_file)
+    if (ub_file)
         HDfree(ub_file);
 
     return EXIT_FAILURE;
@@ -188,8 +162,8 @@ done:
 static void
 leave(int ret)
 {
-   h5tools_close();
-   HDexit(ret);
+    h5tools_close();
+    HDexit(ret);
 }
 
 /*-------------------------------------------------------------------------
@@ -204,14 +178,14 @@ leave(int ret)
 int
 main(int argc, const char *argv[])
 {
-    hid_t               ifile = H5I_INVALID_HID;
-    hid_t               plist = H5I_INVALID_HID;
-    off_t               fsize;
-    hsize_t             usize;
-    htri_t              testval;
-    herr_t              status;
-    int                 res;
-    h5_stat_t           sbuf;
+    hid_t     ifile = H5I_INVALID_HID;
+    hid_t     plist = H5I_INVALID_HID;
+    off_t     fsize;
+    hsize_t   usize;
+    htri_t    testval;
+    herr_t    status;
+    int       res;
+    h5_stat_t sbuf;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -219,7 +193,7 @@ main(int argc, const char *argv[])
     /* Initialize h5tools lib  */
     h5tools_init();
 
-    if(EXIT_FAILURE == parse_command_line(argc, argv))
+    if (EXIT_FAILURE == parse_command_line(argc, argv))
         goto done;
 
     /* enable error reporting if command line option */
@@ -237,12 +211,12 @@ main(int argc, const char *argv[])
 
     if (testval <= 0) {
         error_msg("Input HDF5 file \"%s\" is not HDF\n", input_file);
-        help_ref_msg (stderr);
+        help_ref_msg(stderr);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
 
-    ifile = H5Fopen(input_file, H5F_ACC_RDONLY , H5P_DEFAULT);
+    ifile = H5Fopen(input_file, H5F_ACC_RDONLY, H5P_DEFAULT);
 
     if (ifile < 0) {
         error_msg("Can't open input HDF5 file \"%s\"\n", input_file);
@@ -257,7 +231,7 @@ main(int argc, const char *argv[])
         goto done;
     }
 
-    status = H5Pget_userblock(plist, & usize);
+    status = H5Pget_userblock(plist, &usize);
     if (status < 0) {
         error_msg("Can't get user block for file \"%s\"\n", input_file);
         h5tools_setstatus(EXIT_FAILURE);
@@ -268,14 +242,14 @@ main(int argc, const char *argv[])
     H5Fclose(ifile);
 
     if (usize == 0) {
-  /* no user block to remove: message? */
+        /* no user block to remove: message? */
         error_msg("\"%s\" has no user block: no change to file\n", input_file);
         h5tools_setstatus(EXIT_SUCCESS);
         goto done;
     }
 
     res = HDfstat(HDfileno(rawinstream), &sbuf);
-    if(res < 0) {
+    if (res < 0) {
         error_msg("Can't stat file \"%s\"\n", input_file);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
@@ -290,14 +264,14 @@ main(int argc, const char *argv[])
     }
 
     if (output_file == NULL) {
-            error_msg("unable to open output HDF5 file \"%s\"\n", input_file);
-            h5tools_setstatus(EXIT_FAILURE);
-            goto done;
+        error_msg("unable to open output HDF5 file \"%s\"\n", input_file);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     /* copy from 0 to 'usize - 1' into ufid  */
     if (!do_delete) {
-        if(copy_to_file(rawinstream, rawoutstream, 0, (ssize_t) usize) < 0) {
+        if (copy_to_file(rawinstream, rawoutstream, 0, (ssize_t)usize) < 0) {
             error_msg("unable to copy user block to output file \"%s\"\n", ub_file);
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
@@ -306,20 +280,20 @@ main(int argc, const char *argv[])
 
     /* copy from usize to end of file into h5fid,
      * starting at end of user block if present */
-   if(copy_to_file(rawinstream, rawdatastream, (ssize_t) usize, (ssize_t)(fsize - (ssize_t)usize)) < 0) {
+    if (copy_to_file(rawinstream, rawdatastream, (ssize_t)usize, (ssize_t)(fsize - (ssize_t)usize)) < 0) {
         error_msg("unable to copy hdf5 data to output file \"%s\"\n", output_file);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
 
 done:
-    if(input_file)
+    if (input_file)
         HDfree(input_file);
 
-    if(output_file)
+    if (output_file)
         HDfree(output_file);
 
-    if(ub_file) {
+    if (ub_file) {
         HDfree(ub_file);
     }
 
@@ -334,17 +308,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-copy_to_file( FILE *infid, FILE *ofid, ssize_t _where, ssize_t show_much )
+copy_to_file(FILE *infid, FILE *ofid, ssize_t _where, ssize_t show_much)
 {
     static char buf[COPY_BUF_SIZE];
-    size_t how_much;
-    off_t where = (off_t)_where;
-    off_t to;
-    off_t from;
-    herr_t ret_value = 0;
+    size_t      how_much;
+    off_t       where = (off_t)_where;
+    off_t       to;
+    off_t       from;
+    herr_t      ret_value = 0;
 
     /* nothing to copy */
-    if(show_much <= 0)
+    if (show_much <= 0)
         goto done;
     how_much = (size_t)show_much;
 
@@ -352,27 +326,27 @@ copy_to_file( FILE *infid, FILE *ofid, ssize_t _where, ssize_t show_much )
     HDfseek(infid, 0L, 0);
 
     from = where;
-    to = 0;
-    while(how_much > 0) {
-        size_t bytes_in        = 0;    /* # of bytes to read       */
-        size_t bytes_read      = 0;    /* # of bytes actually read */
-        size_t bytes_wrote     = 0;    /* # of bytes written   */
+    to   = 0;
+    while (how_much > 0) {
+        size_t bytes_in    = 0; /* # of bytes to read       */
+        size_t bytes_read  = 0; /* # of bytes actually read */
+        size_t bytes_wrote = 0; /* # of bytes written   */
 
         if (how_much > COPY_BUF_SIZE)
             bytes_in = COPY_BUF_SIZE;
         else
             bytes_in = how_much;
 
-            /* Seek to correct position in input file */
+        /* Seek to correct position in input file */
         HDfseek(infid, from, SEEK_SET);
 
         /* Read data to buffer */
         bytes_read = HDfread(buf, (size_t)1, bytes_in, infid);
-        if(0 == bytes_read && HDferror(infid)) {
+        if (0 == bytes_read && HDferror(infid)) {
             ret_value = -1;
             goto done;
         } /* end if */
-        if(0 == bytes_read && HDfeof(infid)) {
+        if (0 == bytes_read && HDfeof(infid)) {
             goto done;
         } /* end if */
 
@@ -384,15 +358,14 @@ copy_to_file( FILE *infid, FILE *ofid, ssize_t _where, ssize_t show_much )
         from += (off_t)bytes_read;
         to += (off_t)bytes_read;
 
-       /* Write nchars bytes to output file */
+        /* Write nchars bytes to output file */
         bytes_wrote = HDfwrite(buf, (size_t)1, bytes_read, ofid);
-        if(bytes_wrote != bytes_read || (0 == bytes_wrote && HDferror(ofid))) { /* error */
+        if (bytes_wrote != bytes_read || (0 == bytes_wrote && HDferror(ofid))) { /* error */
             ret_value = -1;
             goto done;
         } /* end if */
-    } /* end while */
+    }     /* end while */
 
 done:
     return ret_value;
-}  /* end copy_to_file */
-
+} /* end copy_to_file */