Formats the source and updates the gcc warning pragmas

1 files changed, 59 insertions, 67 deletions

diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index ad3b7b8..21a647f 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
 #include "H5private.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
@@ -23,33 +22,25 @@
 int d_status = EXIT_SUCCESS;
 
 /* command-line options: short and long-named parameters */
-static const char *s_opts = "hlpvV";
+static const char *        s_opts   = "hlpvV";
 static struct long_options l_opts[] = {
-    { "help",               no_arg, 'h' },
-    { "latest",             no_arg, 'l' },
-    { "parents",            no_arg, 'p' },
-    { "verbose",            no_arg, 'v' },
-    { "version",            no_arg, 'V' },
-    { "vol-value",          require_arg, '1' },
-    { "vol-name",           require_arg, '2' },
-    { "vol-info",           require_arg, '3' },
-    { NULL, 0, '\0' }
-};
+    {"help", no_arg, 'h'},          {"latest", no_arg, 'l'},        {"parents", no_arg, 'p'},
+    {"verbose", no_arg, 'v'},       {"version", no_arg, 'V'},       {"vol-value", require_arg, '1'},
+    {"vol-name", require_arg, '2'}, {"vol-info", require_arg, '3'}, {NULL, 0, '\0'}};
 
 /* Command line parameter settings */
 typedef struct mkgrp_opt_t {
-    char *fname;                /* File name to operate on */
-    hbool_t latest;             /* Whether file should use latest format versions */
-    hbool_t verbose;            /* Whether output should be verbose */
-    hbool_t parents;            /* Whether to create intermediate groups */
-    size_t ngroups;             /* Number of groups to create */
-    char **groups;              /* Pointer to array of group names */
-    hid_t fapl_id;              /* fapl to use when opening the file */
+    char *  fname;   /* File name to operate on */
+    hbool_t latest;  /* Whether file should use latest format versions */
+    hbool_t verbose; /* Whether output should be verbose */
+    hbool_t parents; /* Whether to create intermediate groups */
+    size_t  ngroups; /* Number of groups to create */
+    char ** groups;  /* Pointer to array of group names */
+    hid_t   fapl_id; /* fapl to use when opening the file */
 } mkgrp_opt_t;
 
-mkgrp_opt_t params_g;           /* Command line parameter settings */
+mkgrp_opt_t params_g; /* Command line parameter settings */
 
-
 /*-------------------------------------------------------------------------
  * Function:    leave
  *
@@ -81,7 +72,6 @@ leave(int ret)
     HDexit(ret);
 } /* end leave() */
 
-
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -100,20 +90,24 @@ usage(const char *prog)
     PRINTSTREAM(rawoutstream, "usage: %s [OPTIONS] FILE GROUP...\n", prog);
     PRINTVALSTREAM(rawoutstream, "   OPTIONS\n");
     PRINTVALSTREAM(rawoutstream, "      -h, --help         Print a usage message and exit\n");
-    PRINTVALSTREAM(rawoutstream, "      -l, --latest       Use latest version of file format to create groups\n");
-    PRINTVALSTREAM(rawoutstream, "      -p, --parents      No error if existing, make parent groups as needed\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      -l, --latest       Use latest version of file format to create groups\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      -p, --parents      No error if existing, make parent groups as needed\n");
     PRINTVALSTREAM(rawoutstream, "      -v, --verbose      Print information about OBJECTS and OPTIONS\n");
     PRINTVALSTREAM(rawoutstream, "      -V, --version      Print version number and exit\n");
-    PRINTVALSTREAM(rawoutstream, "      --vol-value        Value (ID) of the VOL connector to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      --vol-value        Value (ID) of the VOL connector to use for opening the\n");
     PRINTVALSTREAM(rawoutstream, "                         HDF5 file specified\n");
-    PRINTVALSTREAM(rawoutstream, "      --vol-name         Name of the VOL connector to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      --vol-name         Name of the VOL connector to use for opening the\n");
     PRINTVALSTREAM(rawoutstream, "                         HDF5 file specified\n");
-    PRINTVALSTREAM(rawoutstream, "      --vol-info         VOL-specific info to pass to the VOL connector used for\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      --vol-info         VOL-specific info to pass to the VOL connector used for\n");
     PRINTVALSTREAM(rawoutstream, "                         opening the HDF5 file specified\n");
     PRINTVALSTREAM(rawoutstream, "\n");
 } /* end usage() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    parse_command_line
  *
@@ -130,14 +124,14 @@ usage(const char *prog)
 static int
 parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
 {
-    int opt;            /* Option from command line */
-    size_t curr_group;  /* Current group name to copy */
-    hbool_t custom_fapl = FALSE;
+    int                opt;        /* Option from command line */
+    size_t             curr_group; /* Current group name to copy */
+    hbool_t            custom_fapl = FALSE;
     h5tools_vol_info_t vol_info;
-    hid_t tmp_fapl_id = H5I_INVALID_HID;
+    hid_t              tmp_fapl_id = H5I_INVALID_HID;
 
     /* Check for empty command line */
-    if(argc == 1) {
+    if (argc == 1) {
         usage(h5tools_getprogname());
         leave(EXIT_SUCCESS);
     }
@@ -146,8 +140,8 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
     HDmemset(&vol_info, 0, sizeof(h5tools_vol_info_t));
 
     /* Parse command line options */
-    while((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-        switch((char)opt) {
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+        switch ((char)opt) {
             /* Display 'help' */
             case 'h':
                 usage(h5tools_getprogname());
@@ -176,15 +170,15 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
                 break;
 
             case '1':
-                vol_info.type = VOL_BY_VALUE;
+                vol_info.type    = VOL_BY_VALUE;
                 vol_info.u.value = (H5VL_class_value_t)HDatoi(opt_arg);
-                custom_fapl = TRUE;
+                custom_fapl      = TRUE;
                 break;
 
             case '2':
-                vol_info.type = VOL_BY_NAME;
+                vol_info.type   = VOL_BY_NAME;
                 vol_info.u.name = opt_arg;
-                custom_fapl = TRUE;
+                custom_fapl     = TRUE;
                 break;
 
             case '3':
@@ -196,10 +190,10 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
                 usage(h5tools_getprogname());
                 leave(EXIT_FAILURE);
         } /* end switch */
-    } /* end while */
+    }     /* end while */
 
     /* Check for file name to be processed */
-    if(argc <= opt_ind) {
+    if (argc <= opt_ind) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
         leave(EXIT_FAILURE);
@@ -210,7 +204,7 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
     opt_ind++;
 
     /* Check for group(s) to be created */
-    if(argc <= opt_ind) {
+    if (argc <= opt_ind) {
         error_msg("missing group name(s)\n");
         usage(h5tools_getprogname());
         leave(EXIT_FAILURE);
@@ -218,11 +212,11 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
 
     /* Allocate space for the group name pointers */
     options->ngroups = (size_t)(argc - opt_ind);
-    options->groups = (char **)HDmalloc(options->ngroups * sizeof(char *));
+    options->groups  = (char **)HDmalloc(options->ngroups * sizeof(char *));
 
     /* Retrieve the group names */
     curr_group = 0;
-    while(opt_ind < argc) {
+    while (opt_ind < argc) {
         options->groups[curr_group] = HDstrdup(argv[opt_ind]);
         curr_group++;
         opt_ind++;
@@ -248,7 +242,6 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
     return 0;
 } /* parse_command_line() */
 
-
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -261,9 +254,9 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
 int
 main(int argc, const char *argv[])
 {
-    hid_t fid = H5I_INVALID_HID;        /* HDF5 file ID */
-    hid_t lcpl_id = H5I_INVALID_HID;    /* Link creation property list ID */
-    size_t curr_group;                  /* Current group to create */
+    hid_t  fid     = H5I_INVALID_HID; /* HDF5 file ID */
+    hid_t  lcpl_id = H5I_INVALID_HID; /* Link creation property list ID */
+    size_t curr_group;                /* Current group to create */
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -275,13 +268,13 @@ main(int argc, const char *argv[])
     HDmemset(&params_g, 0, sizeof(params_g));
 
     /* Create file access property list */
-    if((params_g.fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+    if ((params_g.fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
         error_msg("Could not create file access property list\n");
         leave(EXIT_FAILURE);
     }
 
     /* Parse command line */
-    if(parse_command_line(argc, argv, &params_g) < 0) {
+    if (parse_command_line(argc, argv, &params_g) < 0) {
         error_msg("unable to parse command line arguments\n");
         leave(EXIT_FAILURE);
     }
@@ -290,15 +283,15 @@ main(int argc, const char *argv[])
     h5tools_error_report();
 
     /* Check for creating groups with new format version */
-    if(params_g.latest) {
+    if (params_g.latest) {
         /* Set the "use the latest version of the format" bounds */
-        if(H5Pset_libver_bounds(params_g.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
+        if (H5Pset_libver_bounds(params_g.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
             error_msg("Could not set property for using latest version of the format\n");
             leave(EXIT_FAILURE);
         }
 
         /* Display some output if requested */
-        if(params_g.verbose)
+        if (params_g.verbose)
             HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
     }
 
@@ -307,67 +300,66 @@ main(int argc, const char *argv[])
 
     /* If we couldn't open an existing file, try creating file */
     /* (use "EXCL" instead of "TRUNC", so we don't blow away existing non-HDF5 file) */
-    if(fid < 0)
+    if (fid < 0)
         fid = H5Fcreate(params_g.fname, H5F_ACC_EXCL, H5P_DEFAULT, params_g.fapl_id);
 
     /* Test for error in opening file */
-    if(fid < 0) {
+    if (fid < 0) {
         error_msg("Could not open output file '%s'\n", params_g.fname);
         leave(EXIT_FAILURE);
     }
 
     /* Create link creation property list */
-    if((lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) {
+    if ((lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) {
         error_msg("Could not create link creation property list\n");
         leave(EXIT_FAILURE);
     }
 
     /* Check for creating intermediate groups */
-    if(params_g.parents) {
+    if (params_g.parents) {
         /* Set the intermediate group creation property */
-        if(H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0) {
+        if (H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0) {
             error_msg("Could not set property for creating parent groups\n");
             leave(EXIT_FAILURE);
         }
 
         /* Display some output if requested */
-        if(params_g.verbose)
+        if (params_g.verbose)
             HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
     }
 
     /* Loop over creating requested groups */
-    for(curr_group = 0; curr_group < params_g.ngroups; curr_group++) {
-        hid_t gid;              /* Group ID */
+    for (curr_group = 0; curr_group < params_g.ngroups; curr_group++) {
+        hid_t gid; /* Group ID */
 
         /* Attempt to create a group */
-        if((gid = H5Gcreate2(fid, params_g.groups[curr_group], lcpl_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
+        if ((gid = H5Gcreate2(fid, params_g.groups[curr_group], lcpl_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             error_msg("Could not create group '%s'\n", params_g.groups[curr_group]);
             leave(EXIT_FAILURE);
         }
 
         /* Close the group */
-        if(H5Gclose(gid) < 0) {
+        if (H5Gclose(gid) < 0) {
             error_msg("Could not close group '%s'??\n", params_g.groups[curr_group]);
             leave(EXIT_FAILURE);
         }
 
         /* Display some output if requested */
-        if(params_g.verbose)
+        if (params_g.verbose)
             HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]);
     } /* end for */
 
     /* Close link creation property list */
-    if(H5Pclose(lcpl_id) < 0) {
+    if (H5Pclose(lcpl_id) < 0) {
         error_msg("Could not close link creation property list\n");
         leave(EXIT_FAILURE);
     }
 
     /* Close file */
-    if(H5Fclose(fid) < 0) {
+    if (H5Fclose(fid) < 0) {
         error_msg("Could not close output file '%s'??\n", params_g.fname);
         leave(EXIT_FAILURE);
     }
 
     leave(EXIT_SUCCESS);
 } /* end main() */
-