Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

6 files changed, 857 insertions, 520 deletions

diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt
index 96ed6ad..e54b2da 100644
--- a/tools/src/h5diff/CMakeLists.txt
+++ b/tools/src/h5diff/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.12)
 project (HDF5_TOOLS_SRC_H5DIFF C)
 
 # --------------------------------------------------------------------
@@ -8,8 +8,11 @@ if (NOT ONLY_SHARED_LIBS)
   add_executable (h5diff
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.h
   )
-  target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_compile_options(h5diff PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  #target_compile_definitions (h5diff PRIVATE H5_TOOLS_DEBUG)
   TARGET_C_PROPERTIES (h5diff STATIC)
   target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (h5diff PROPERTIES FOLDER tools)
@@ -21,8 +24,11 @@ if (BUILD_SHARED_LIBS)
   add_executable (h5diff-shared
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.h
   )
-  target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_compile_options(h5diff-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  #target_compile_definitions (h5diff-shared PRIVATE H5_TOOLS_DEBUG)
   TARGET_C_PROPERTIES (h5diff-shared SHARED)
   target_link_libraries (h5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5diff-shared PROPERTIES FOLDER tools)
@@ -31,13 +37,25 @@ if (BUILD_SHARED_LIBS)
   set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5diff-shared)
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_H5DIFF_SRC_FORMAT h5diff)
+  else ()
+    clang_format (HDF5_H5DIFF_SRC_FORMAT h5diff-shared)
+  endif ()
+endif ()
+
 if (H5_HAVE_PARALLEL)
   if (NOT ONLY_SHARED_LIBS)
     add_executable (ph5diff
         ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
         ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
     )
-    target_include_directories (ph5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    target_include_directories (ph5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    target_compile_options(ph5diff PRIVATE "${HDF5_CMAKE_C_FLAGS}")
     TARGET_C_PROPERTIES (ph5diff STATIC)
     target_link_libraries (ph5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
     set_target_properties (ph5diff PROPERTIES FOLDER tools)
@@ -49,7 +67,8 @@ if (H5_HAVE_PARALLEL)
         ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
         ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
     )
-    target_include_directories (ph5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    target_include_directories (ph5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    target_compile_options(ph5diff-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
     TARGET_C_PROPERTIES (ph5diff-shared SHARED)
     target_link_libraries (ph5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
     set_target_properties (ph5diff-shared PROPERTIES FOLDER tools)
diff --git a/tools/src/h5diff/Makefile.am b/tools/src/h5diff/Makefile.am
index 3957e59..451ad20 100644
--- a/tools/src/h5diff/Makefile.am
+++ b/tools/src/h5diff/Makefile.am
@@ -6,7 +6,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 ##
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index 362e3f2..2619a9d 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -17,42 +17,53 @@
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-static int check_n_input(const char*);
-static int check_p_input(const char*);
-static int check_d_input(const char*);
+static int check_n_input(const char *);
+static int check_p_input(const char *);
+static int check_d_input(const char *);
 
 /*
  * Command-line options: The user can specify short or long-named
  * parameters.
  */
-static const char *s_opts = "hVrv:qn:d:p:NcelxE:S";
-static struct long_options l_opts[] = {
-    { "help", no_arg, 'h' },
-    { "version", no_arg, 'V' },
-    { "report", no_arg, 'r' },
-    { "verbose", optional_arg, 'v' },
-    { "quiet", no_arg, 'q' },
-    { "count", require_arg, 'n' },
-    { "delta", require_arg, 'd' },
-    { "relative", require_arg, 'p' },
-    { "nan", no_arg, 'N' },
-    { "compare", no_arg, 'c' },
-    { "use-system-epsilon", no_arg, 'e' },
-    { "follow-symlinks", no_arg, 'l' },
-    { "no-dangling-links", no_arg, 'x' },
-    { "exclude-path", require_arg, 'E' },
-    { "enable-error-stack", no_arg, 'S' },
-    { NULL, 0, '\0' }
-};
+static const char *           s_opts   = "hVrv*qn:d:p:NcelxE:A:S*";
+static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
+                                          {"version", no_arg, 'V'},
+                                          {"report", no_arg, 'r'},
+                                          {"verbose", optional_arg, 'v'},
+                                          {"quiet", no_arg, 'q'},
+                                          {"count", require_arg, 'n'},
+                                          {"delta", require_arg, 'd'},
+                                          {"relative", require_arg, 'p'},
+                                          {"nan", no_arg, 'N'},
+                                          {"compare", no_arg, 'c'},
+                                          {"use-system-epsilon", no_arg, 'e'},
+                                          {"follow-symlinks", no_arg, 'l'},
+                                          {"no-dangling-links", no_arg, 'x'},
+                                          {"exclude-path", require_arg, 'E'},
+                                          {"exclude-attribute", require_arg, 'A'},
+                                          {"enable-error-stack", optional_arg, 'S'},
+                                          {"vol-value-1", require_arg, '1'},
+                                          {"vol-name-1", require_arg, '2'},
+                                          {"vol-info-1", require_arg, '3'},
+                                          {"vol-value-2", require_arg, '4'},
+                                          {"vol-name-2", require_arg, '5'},
+                                          {"vol-info-2", require_arg, '6'},
+                                          {"vfd-value-1", require_arg, '7'},
+                                          {"vfd-name-1", require_arg, '8'},
+                                          {"vfd-info-1", require_arg, '9'},
+                                          {"vfd-value-2", require_arg, '0'},
+                                          {"vfd-name-2", require_arg, 'Y'},
+                                          {"vfd-info-2", require_arg, 'Z'},
+                                          {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function: check_options
  *
  * Purpose: parse command line input
- *
  *-------------------------------------------------------------------------
  */
-static void check_options(diff_opt_t* opts)
+static void
+check_options(diff_opt_t *opts)
 {
     /*--------------------------------------------------------------
      * check for mutually exclusive options
@@ -61,37 +72,151 @@ static void check_options(diff_opt_t* opts)
     /* check between -d , -p, --use-system-epsilon.
      * These options are mutually exclusive.
      */
-    if ((opts->d + opts->p + opts->use_system_epsilon) > 1) {
+    if ((opts->delta_bool + opts->percent_bool + opts->use_system_epsilon) > 1) {
         HDprintf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
         HDprintf("use no more than one.\n");
-        HDprintf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
+        HDprintf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 "
+                 "Reference Manual'.\n",
+                 PROGRAMNAME);
         h5diff_exit(EXIT_FAILURE);
     }
 }
 
+/*-------------------------------------------------------------------------
+ * Function:    parse_hsize_list
+ *
+ * Purpose:     Parse a list of comma or space separated integers and return
+ *              them in a list. The string being passed into this function
+ *              should be at the start of the list you want to parse. You are
+ *              responsible for freeing the array returned from here.
+ *
+ *              Lists in the so-called "terse" syntax are separated by
+ *              semicolons (;). The lists themselves can be separated by
+ *              either commas (,) or white spaces.
+ *
+ * Return:      <none>
+ *-------------------------------------------------------------------------
+ */
+static void
+parse_hsize_list(const char *h_list, subset_d *d)
+{
+    hsize_t *    p_list;
+    const char * ptr;
+    unsigned int size_count = 0;
+    unsigned int i          = 0;
+    unsigned int last_digit = 0;
+
+    if (!h_list || !*h_list || *h_list == ';')
+        return;
+
+    H5TOOLS_START_DEBUG(" - h_list:%s", h_list);
+    /* count how many integers do we have */
+    for (ptr = h_list; ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
+        if (HDisdigit(*ptr)) {
+            if (!last_digit)
+                /* the last read character wasn't a digit */
+                size_count++;
+
+            last_digit = 1;
+        }
+        else
+            last_digit = 0;
+
+    if (size_count == 0) {
+        /* there aren't any integers to read */
+        H5TOOLS_ENDDEBUG("No integers to read");
+        return;
+    }
+    H5TOOLS_DEBUG("Number integers to read=%ld", size_count);
+
+    /* allocate an array for the integers in the list */
+    if ((p_list = (hsize_t *)HDcalloc(size_count, sizeof(hsize_t))) == NULL)
+        H5TOOLS_INFO("Unable to allocate space for subset data");
+
+    for (ptr = h_list; i < size_count && ptr && *ptr && *ptr != ';' && *ptr != ']'; ptr++)
+        if (HDisdigit(*ptr)) {
+            /* we should have an integer now */
+            p_list[i++] = (hsize_t)HDstrtoull(ptr, NULL, 0);
+
+            while (HDisdigit(*ptr))
+                /* scroll to end of integer */
+                ptr++;
+        }
+    d->data = p_list;
+    d->len  = size_count;
+    H5TOOLS_ENDDEBUG(" ");
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    parse_subset_params
+ *
+ * Purpose:     Parse the so-called "terse" syntax for specifying subsetting parameters.
+ *
+ * Return:      Success:    struct subset_t object
+ *              Failure:    NULL
+ *-------------------------------------------------------------------------
+ */
+static struct subset_t *
+parse_subset_params(const char *dset)
+{
+    struct subset_t *s = NULL;
+    char *           brace;
+
+    H5TOOLS_START_DEBUG(" - dset:%s", dset);
+    if ((brace = HDstrrchr(dset, '[')) != NULL) {
+        *brace++ = '\0';
+
+        s = (struct subset_t *)HDcalloc(1, sizeof(struct subset_t));
+        parse_hsize_list(brace, &s->start);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->stride);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->count);
+
+        while (*brace && *brace != ';')
+            brace++;
+
+        if (*brace)
+            brace++;
+
+        parse_hsize_list(brace, &s->block);
+    }
+    H5TOOLS_ENDDEBUG(" ");
+
+    return s;
+}
 
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
  * Purpose: parse command line input
- *
  *-------------------------------------------------------------------------
  */
 
-void parse_command_line(int argc,
-                        const char* argv[],
-                        const char** fname1,
-                        const char** fname2,
-                        const char** objname1,
-                        const char** objname2,
-                        diff_opt_t* opts)
+void
+parse_command_line(int argc, const char *const *argv, const char **fname1, const char **fname2,
+                   const char **objname1, const char **objname2, diff_opt_t *opts)
 {
-    int i;
-    int opt;
+    int                       i;
+    int                       opt;
     struct exclude_path_list *exclude_head, *exclude_prev, *exclude_node;
+    struct exclude_path_list *exclude_attr_head, *exclude_attr_prev, *exclude_attr_node;
 
+    H5TOOLS_START_DEBUG(" ");
     /* process the command-line */
-    memset(opts, 0, sizeof (diff_opt_t));
+    HDmemset(opts, 0, sizeof(diff_opt_t));
 
     /* assume equal contents initially */
     opts->contents = 1;
@@ -100,164 +225,254 @@ void parse_command_line(int argc,
     opts->do_nans = 1;
 
     /* not Listing objects that are not comparable */
-    opts->m_list_not_cmp = 0;
+    opts->mode_list_not_cmp = 0;
 
     /* initially no not-comparable. */
     /**this is bad in mixing option with results**/
-    opts->not_cmp=0;
+    opts->not_cmp = 0;
 
     /* init for exclude-path option */
     exclude_head = NULL;
 
+    /* init for exclude-attribute option */
+    exclude_attr_head = NULL;
+
     /* parse command line options */
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+    while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
-        default:
-            usage();
-            h5diff_exit(EXIT_FAILURE);
-            break;
-
-        case 'h':
-            usage();
-            h5diff_exit(EXIT_SUCCESS);
-            break;
-
-        case 'V':
-            print_version(h5tools_getprogname());
-            h5diff_exit(EXIT_SUCCESS);
-            break;
-
-        case 'v':
-            opts->m_verbose = 1;
-            /* This for loop is for handling style like
-             * -v, -v1, --verbose, --verbose=1.
-             */
-            for (i = 1; i < argc; i++) {
-                /*
-                 * short opt
-                 */
-                if (!strcmp (argv[i], "-v")) {  /* no arg */
-                    opt_ind--;
-                    opts->m_verbose_level = 0;
-                    break;
-                }
-                else if (!strncmp (argv[i], "-v", (size_t)2)) {
-                    opts->m_verbose_level = atoi(&argv[i][2]);
-                    break;
-                }
+            default:
+                usage();
+                h5diff_exit(EXIT_FAILURE);
+                break;
 
-                /*
-                 * long opt
-                 */
-                if (!strcmp (argv[i], "--verbose")) {  /* no arg */
-                    opts->m_verbose_level = 0;
-                    break;
+            case 'h':
+                usage();
+                h5diff_exit(EXIT_SUCCESS);
+                break;
+
+            case 'V':
+                print_version(h5tools_getprogname());
+                h5diff_exit(EXIT_SUCCESS);
+                break;
+
+            case 'v':
+                opts->mode_verbose = 1;
+                for (i = 1; i < argc; i++) {
+                    /*
+                     * special check for short opt
+                     */
+                    if (!strcmp(argv[i], "-v")) {
+                        if (H5_optarg != NULL)
+                            H5_optind--;
+                        opts->mode_verbose_level = 0;
+                        break;
+                    }
+                    else if (!strncmp(argv[i], "-v", (size_t)2)) {
+                        if (H5_optarg != NULL)
+                            H5_optind--;
+                        opts->mode_verbose_level = atoi(&argv[i][2]);
+                        break;
+                    }
+                    else {
+                        if (H5_optarg != NULL)
+                            opts->mode_verbose_level = HDatoi(H5_optarg);
+                        else
+                            opts->mode_verbose_level = 0;
+                    }
                 }
-                else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=') {
-                    opts->m_verbose_level = atoi(&argv[i][10]);
-                    break;
+                break;
+
+            case 'q':
+                /* use quiet mode; suppress the message "0 differences found" */
+                opts->mode_quiet = 1;
+                break;
+
+            case 'r':
+                opts->mode_report = 1;
+                break;
+
+            case 'l':
+                opts->follow_links = TRUE;
+                break;
+
+            case 'x':
+                opts->no_dangle_links = 1;
+                break;
+
+            case 'S':
+                if (H5_optarg != NULL)
+                    enable_error_stack = HDatoi(H5_optarg);
+                else
+                    enable_error_stack = 1;
+                break;
+
+            case 'E':
+                opts->exclude_path = 1;
+
+                /* create linked list of excluding objects */
+                if ((exclude_node = (struct exclude_path_list *)HDmalloc(sizeof(struct exclude_path_list))) ==
+                    NULL) {
+                    HDprintf("Error: lack of memory!\n");
+                    h5diff_exit(EXIT_FAILURE);
                 }
-            }
-            break;
 
-        case 'q':
-            /* use quiet mode; supress the message "0 differences found" */
-            opts->m_quiet = 1;
-            break;
+                /* init */
+                exclude_node->obj_path = H5_optarg;
+                exclude_node->obj_type = H5TRAV_TYPE_UNKNOWN;
+                exclude_prev           = exclude_head;
 
-        case 'r':
-            opts->m_report = 1;
-            break;
+                if (NULL == exclude_head) {
+                    exclude_head       = exclude_node;
+                    exclude_head->next = NULL;
+                }
+                else {
+                    while (NULL != exclude_prev->next)
+                        exclude_prev = exclude_prev->next;
 
-        case 'l':
-            opts->follow_links = TRUE;
-            break;
+                    exclude_node->next = NULL;
+                    exclude_prev->next = exclude_node;
+                }
+                break;
 
-        case 'x':
-            opts->no_dangle_links = 1;
-            break;
+            case 'A':
+                opts->exclude_attr_path = 1;
 
-        case 'S':
-            enable_error_stack = 1;
-            break;
+                /* create linked list of excluding objects */
+                if ((exclude_attr_node =
+                         (struct exclude_path_list *)HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
+                    HDprintf("Error: lack of memory!\n");
+                    h5diff_exit(EXIT_FAILURE);
+                }
 
-        case 'E':
-            opts->exclude_path = 1;
+                /* init */
+                exclude_attr_node->obj_path = H5_optarg;
+                exclude_attr_node->obj_type = H5TRAV_TYPE_UNKNOWN;
+                exclude_attr_prev           = exclude_attr_head;
 
-            /* create linked list of excluding objects */
-            if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
-                HDprintf("Error: lack of memory!\n");
-                h5diff_exit(EXIT_FAILURE);
-            }
-
-            /* init */
-            exclude_node->obj_path = (char*)opt_arg;
-            exclude_node->obj_type = H5TRAV_TYPE_UNKNOWN;
-            exclude_prev = exclude_head;
-
-            if (NULL == exclude_head) {
-                exclude_head = exclude_node;
-                exclude_head->next = NULL;
-            }
-            else {
-                while(NULL != exclude_prev->next)
-                    exclude_prev=exclude_prev->next;
-
-                exclude_node->next = NULL;
-                exclude_prev->next = exclude_node;
-            }
-            break;
-
-        case 'd':
-            opts->d=1;
-
-            if (check_d_input(opt_arg) == - 1) {
-                HDprintf("<-d %s> is not a valid option\n", opt_arg);
-                usage();
-                h5diff_exit(EXIT_FAILURE);
-            }
-            opts->delta = atof(opt_arg);
-
-            /* -d 0 is the same as default */
-            if (H5_DBL_ABS_EQUAL(opts->delta, (double)0.0F))
-                opts->d=0;
-            break;
-
-        case 'p':
-            opts->p=1;
-            if (check_p_input(opt_arg) == -1) {
-                HDprintf("<-p %s> is not a valid option\n", opt_arg);
-                usage();
-                h5diff_exit(EXIT_FAILURE);
-            }
-            opts->percent = atof(opt_arg);
-
-            /* -p 0 is the same as default */
-            if (H5_DBL_ABS_EQUAL(opts->percent, (double)0.0F))
-                opts->p = 0;
-            break;
-
-        case 'n':
-            opts->n=1;
-            if ( check_n_input(opt_arg) == -1) {
-                HDprintf("<-n %s> is not a valid option\n", opt_arg);
-                usage();
-                h5diff_exit(EXIT_FAILURE);
-            }
-            opts->count = HDstrtoull(opt_arg, NULL, 0);
-            break;
+                if (NULL == exclude_attr_head) {
+                    exclude_attr_head       = exclude_attr_node;
+                    exclude_attr_head->next = NULL;
+                }
+                else {
+                    while (NULL != exclude_attr_prev->next)
+                        exclude_attr_prev = exclude_attr_prev->next;
 
-        case 'N':
-            opts->do_nans = 0;
-            break;
+                    exclude_attr_node->next = NULL;
+                    exclude_attr_prev->next = exclude_attr_node;
+                }
+                break;
 
-        case 'c':
-            opts->m_list_not_cmp = 1;
-            break;
+            case 'd':
+                opts->delta_bool = 1;
 
-        case 'e':
-            opts->use_system_epsilon = 1;
-            break;
+                if (check_d_input(H5_optarg) == -1) {
+                    HDprintf("<-d %s> is not a valid option\n", H5_optarg);
+                    usage();
+                    h5diff_exit(EXIT_FAILURE);
+                }
+                opts->delta = HDatof(H5_optarg);
+                /* do not check against default, the DBL_EPSILON is being replaced by user */
+                break;
+
+            case 'p':
+                opts->percent_bool = 1;
+                if (check_p_input(H5_optarg) == -1) {
+                    HDprintf("<-p %s> is not a valid option\n", H5_optarg);
+                    usage();
+                    h5diff_exit(EXIT_FAILURE);
+                }
+                opts->percent = HDatof(H5_optarg);
+
+                /* -p 0 is the same as default */
+                if (H5_DBL_ABS_EQUAL(opts->percent, 0.0))
+                    opts->percent_bool = 0;
+                break;
+
+            case 'n':
+                opts->count_bool = 1;
+                if (check_n_input(H5_optarg) == -1) {
+                    HDprintf("<-n %s> is not a valid option\n", H5_optarg);
+                    usage();
+                    h5diff_exit(EXIT_FAILURE);
+                }
+                opts->count = HDstrtoull(H5_optarg, NULL, 0);
+                break;
+
+            case 'N':
+                opts->do_nans = 0;
+                break;
+
+            case 'c':
+                opts->mode_list_not_cmp = 1;
+                break;
+
+            case 'e':
+                opts->use_system_epsilon = 1;
+                break;
+
+            case '1':
+                opts->vol_info[0].type    = VOL_BY_VALUE;
+                opts->vol_info[0].u.value = (H5VL_class_value_t)HDatoi(H5_optarg);
+                opts->custom_vol[0]       = TRUE;
+                break;
+
+            case '2':
+                opts->vol_info[0].type   = VOL_BY_NAME;
+                opts->vol_info[0].u.name = H5_optarg;
+                opts->custom_vol[0]      = TRUE;
+                break;
+
+            case '3':
+                opts->vol_info[0].info_string = H5_optarg;
+                break;
+
+            case '4':
+                opts->vol_info[1].type    = VOL_BY_VALUE;
+                opts->vol_info[1].u.value = (H5VL_class_value_t)HDatoi(H5_optarg);
+                opts->custom_vol[1]       = TRUE;
+                break;
+
+            case '5':
+                opts->vol_info[1].type   = VOL_BY_NAME;
+                opts->vol_info[1].u.name = H5_optarg;
+                opts->custom_vol[1]      = TRUE;
+                break;
+
+            case '6':
+                opts->vol_info[1].info_string = H5_optarg;
+                break;
+
+            case '7':
+                opts->vfd_info[0].type    = VFD_BY_VALUE;
+                opts->vfd_info[0].u.value = (H5FD_class_value_t)HDatoi(H5_optarg);
+                opts->custom_vfd[0]       = TRUE;
+                break;
+
+            case '8':
+                opts->vfd_info[0].type   = VFD_BY_NAME;
+                opts->vfd_info[0].u.name = H5_optarg;
+                opts->custom_vol[0]      = TRUE;
+                break;
+
+            case '9':
+                opts->vfd_info[0].info = (const void *)H5_optarg;
+                break;
+
+            case '0':
+                opts->vfd_info[1].type    = VFD_BY_VALUE;
+                opts->vfd_info[1].u.value = (H5FD_class_value_t)HDatoi(H5_optarg);
+                opts->custom_vfd[1]       = TRUE;
+                break;
+
+            case 'Y':
+                opts->vfd_info[1].type   = VFD_BY_NAME;
+                opts->vfd_info[1].u.name = H5_optarg;
+                opts->custom_vfd[1]      = TRUE;
+                break;
+
+            case 'Z':
+                opts->vfd_info[1].info = (const void *)H5_optarg;
+                break;
         }
     }
 
@@ -268,64 +483,79 @@ void parse_command_line(int argc,
     if (opts->exclude_path)
         opts->exclude = exclude_head;
 
+    /* if exclude-attribute option is used, keep the exclude attr list */
+    if (opts->exclude_attr_path)
+        opts->exclude_attr = exclude_attr_head;
+
     /* check for file names to be processed */
-    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) {
+    if (argc <= H5_optind || argv[H5_optind + 1] == NULL) {
         error_msg("missing file names\n");
         usage();
         h5diff_exit(EXIT_FAILURE);
     }
 
-    *fname1 = argv[ opt_ind ];
-    *fname2 = argv[ opt_ind + 1 ];
-    *objname1 = argv[ opt_ind + 2 ];
+    *fname1   = argv[H5_optind];
+    *fname2   = argv[H5_optind + 1];
+    *objname1 = argv[H5_optind + 2];
+    H5TOOLS_DEBUG("file1 = %s", *fname1);
+    H5TOOLS_DEBUG("file2 = %s", *fname2);
 
     if (*objname1 == NULL) {
         *objname2 = NULL;
+        H5TOOLS_ENDDEBUG("No obj names");
         return;
     }
+    H5TOOLS_DEBUG("objname1 = %s", *objname1);
 
-    if (argv[ opt_ind + 3 ] != NULL) {
-        *objname2 = argv[ opt_ind + 3 ];
+    if (argv[H5_optind + 3] != NULL) {
+        *objname2 = argv[H5_optind + 3];
     }
     else {
         *objname2 = *objname1;
     }
+    H5TOOLS_DEBUG("objname2 = %s", *objname2);
+
+    /*
+     * TRILABS_227 is complete except for an issue with printing indices
+     * the following calls will enable subsetting
+     */
+    opts->sset[0] = parse_subset_params(*objname1);
 
+    opts->sset[1] = parse_subset_params(*objname2);
 
+    H5TOOLS_ENDDEBUG(" ");
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: print_info
  *
  * Purpose: print several information messages after h5diff call
- *
  *-------------------------------------------------------------------------
  */
+void
+print_info(diff_opt_t *opts)
+{
+    if (opts->mode_quiet || opts->err_stat)
+        return;
 
- void  print_info(diff_opt_t* opts)
- {
-     if (opts->m_quiet || opts->err_stat)
-         return;
-
-     if (opts->cmn_objs == 0) {
-         HDprintf("No common objects found. Files are not comparable.\n");
-         if (!opts->m_verbose)
-             HDprintf("Use -v for a list of objects.\n");
-     }
-
-     if (opts->not_cmp == 1) {
-         if (opts->m_list_not_cmp == 0) {
-             HDprintf("--------------------------------\n");
-             HDprintf("Some objects are not comparable\n");
-             HDprintf("--------------------------------\n");
-             if (opts->m_verbose)
-                 HDprintf("Use -c for a list of objects without details of differences.\n");
-             else
-                 HDprintf("Use -c for a list of objects.\n");
-         }
-     }
- }
+    if (opts->cmn_objs == 0) {
+        HDprintf("No common objects found. Files are not comparable.\n");
+        if (!opts->mode_verbose)
+            HDprintf("Use -v for a list of objects.\n");
+    }
+
+    if (opts->not_cmp == 1) {
+        if (opts->mode_list_not_cmp == 0) {
+            HDprintf("--------------------------------\n");
+            HDprintf("Some objects are not comparable\n");
+            HDprintf("--------------------------------\n");
+            if (opts->mode_verbose)
+                HDprintf("Use -c for a list of objects without details of differences.\n");
+            else
+                HDprintf("Use -c for a list of objects.\n");
+        }
+    }
+}
 
 /*-------------------------------------------------------------------------
  * Function: check_n_input
@@ -333,22 +563,13 @@ void parse_command_line(int argc,
  * Purpose: check for valid input
  *
  * Return: 1 for ok, -1 for fail
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5_ATTR_PURE static int
-check_n_input( const char *str )
+check_n_input(const char *str)
 {
     unsigned i;
-    char c;
+    char     c;
 
     for (i = 0; i < HDstrlen(str); i++) {
         c = str[i];
@@ -356,9 +577,8 @@ check_n_input( const char *str )
             if (c < 49 || c > 57) /* ascii values between 1 and 9 */
                 return -1;
         }
-        else
-            if (c < 48 || c > 57) /* 0 also */
-                return -1;
+        else if (c < 48 || c > 57) /* 0 also */
+            return -1;
     }
     return 1;
 }
@@ -369,28 +589,21 @@ check_n_input( const char *str )
  * Purpose: check for a valid p option input
  *
  * Return: 1 for ok, -1 for fail
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
-check_p_input( const char *str )
+check_p_input(const char *str)
 {
     double x;
 
     /*
-    the atof return value on a hexadecimal input is different
-    on some systems; we do a character check for this
-    */
+     * the atof return value on a hexadecimal input is different
+     * on some systems; we do a character check for this
+     */
     if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
-    x = atof(str);
+    x = HDatof(str);
     if (x < 0)
         return -1;
 
@@ -403,28 +616,21 @@ check_p_input( const char *str )
  * Purpose: check for a valid d option input
  *
  * Return: 1 for ok, -1 for fail
- *
- * Date: November 11, 2007
- *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
-check_d_input( const char *str )
+check_d_input(const char *str)
 {
     double x;
 
     /*
-    the atof return value on a hexadecimal input is different
-    on some systems; we do a character check for this
-    */
+     * the atof return value on a hexadecimal input is different
+     * on some systems; we do a character check for this
+     */
     if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
-    x = atof(str);
+    x = HDatof(str);
     if (x < 0)
         return -1;
 
@@ -437,159 +643,278 @@ check_d_input( const char *str )
  * Purpose: print a usage message
  *
  * Return: void
- *
  *-------------------------------------------------------------------------
  */
 
-void usage(void)
+void
+usage(void)
 {
- PRINTVALSTREAM(rawoutstream, "usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]\n");
- PRINTVALSTREAM(rawoutstream, "  file1             File name of the first HDF5 file\n");
- PRINTVALSTREAM(rawoutstream, "  file2             File name of the second HDF5 file\n");
- PRINTVALSTREAM(rawoutstream, "  [obj1]            Name of an HDF5 object, in absolute path\n");
- PRINTVALSTREAM(rawoutstream, "  [obj2]            Name of an HDF5 object, in absolute path\n");
- PRINTVALSTREAM(rawoutstream, "\n");
- PRINTVALSTREAM(rawoutstream, "  OPTIONS\n");
- PRINTVALSTREAM(rawoutstream, "   -h, --help\n");
- PRINTVALSTREAM(rawoutstream, "         Print a usage message and exit.\n");
- PRINTVALSTREAM(rawoutstream, "   -V, --version\n");
- PRINTVALSTREAM(rawoutstream, "         Print version number and exit.\n");
- PRINTVALSTREAM(rawoutstream, "   -r, --report\n");
- PRINTVALSTREAM(rawoutstream, "         Report mode. Print differences.\n");
- PRINTVALSTREAM(rawoutstream, "   -v --verbose\n");
- PRINTVALSTREAM(rawoutstream, "         Verbose mode. Print differences information and list of objects.\n");
- PRINTVALSTREAM(rawoutstream, "   -vN --verbose=N\n");
- PRINTVALSTREAM(rawoutstream, "         Verbose mode with level. Print differences and list of objects.\n");
- PRINTVALSTREAM(rawoutstream, "         Level of detail depends on value of N:\n");
- PRINTVALSTREAM(rawoutstream, "          0 : Identical to '-v' or '--verbose'.\n");
- PRINTVALSTREAM(rawoutstream, "          1 : All level 0 information plus one-line attribute\n");
- PRINTVALSTREAM(rawoutstream, "              status summary.\n");
- PRINTVALSTREAM(rawoutstream, "          2 : All level 1 information plus extended attribute\n");
- PRINTVALSTREAM(rawoutstream, "              status report.\n");
- PRINTVALSTREAM(rawoutstream, "   -q, --quiet\n");
- PRINTVALSTREAM(rawoutstream, "         Quiet mode. Do not produce output.\n");
- PRINTVALSTREAM(rawoutstream, "   --enable-error-stack\n");
- PRINTVALSTREAM(rawoutstream, "                   Prints messages from the HDF5 error stack as they occur.\n");
- PRINTVALSTREAM(rawoutstream, "   --follow-symlinks\n");
- PRINTVALSTREAM(rawoutstream, "         Follow symbolic links (soft links and external links and compare the)\n");
- PRINTVALSTREAM(rawoutstream, "         links' target objects.\n");
- PRINTVALSTREAM(rawoutstream, "         If symbolic link(s) with the same name exist in the files being\n");
- PRINTVALSTREAM(rawoutstream, "         compared, then determine whether the target of each link is an existing\n");
- PRINTVALSTREAM(rawoutstream, "         object (dataset, group, or named datatype) or the link is a dangling\n");
- PRINTVALSTREAM(rawoutstream, "         link (a soft or external link pointing to a target object that does\n");
- PRINTVALSTREAM(rawoutstream, "         not yet exist).\n");
- PRINTVALSTREAM(rawoutstream, "         - If both symbolic links are dangling links, they are treated as being\n");
- PRINTVALSTREAM(rawoutstream, "           the same; by default, h5diff returns an exit code of 0.\n");
- PRINTVALSTREAM(rawoutstream, "           If, however, --no-dangling-links is used with --follow-symlinks,\n");
- PRINTVALSTREAM(rawoutstream, "           this situation is treated as an error and h5diff returns an\n");
- PRINTVALSTREAM(rawoutstream, "           exit code of 2.\n");
- PRINTVALSTREAM(rawoutstream, "         - If only one of the two links is a dangling link,they are treated as\n");
- PRINTVALSTREAM(rawoutstream, "           being different and h5diff returns an exit code of 1.\n");
- PRINTVALSTREAM(rawoutstream, "           If, however, --no-dangling-links is used with --follow-symlinks,\n");
- PRINTVALSTREAM(rawoutstream, "           this situation is treated as an error and h5diff returns an\n");
- PRINTVALSTREAM(rawoutstream, "           exit code of 2.\n");
- PRINTVALSTREAM(rawoutstream, "         - If both symbolic links point to existing objects, h5diff compares the\n");
- PRINTVALSTREAM(rawoutstream, "           two objects.\n");
- PRINTVALSTREAM(rawoutstream, "         If any symbolic link specified in the call to h5diff does not exist,\n");
- PRINTVALSTREAM(rawoutstream, "         h5diff treats it as an error and returns an exit code of 2.\n");
- PRINTVALSTREAM(rawoutstream, "   --no-dangling-links\n");
- PRINTVALSTREAM(rawoutstream, "         Must be used with --follow-symlinks option; otherwise, h5diff shows\n");
- PRINTVALSTREAM(rawoutstream, "         error message and returns an exit code of 2.\n");
- PRINTVALSTREAM(rawoutstream, "         Check for any symbolic links (soft links or external links) that do not\n");
- PRINTVALSTREAM(rawoutstream, "         resolve to an existing object (dataset, group, or named datatype).\n");
- PRINTVALSTREAM(rawoutstream, "         If any dangling link is found, this situation is treated as an error\n");
- PRINTVALSTREAM(rawoutstream, "         and h5diff returns an exit code of 2.\n");
- PRINTVALSTREAM(rawoutstream, "   -c, --compare\n");
- PRINTVALSTREAM(rawoutstream, "         List objects that are not comparable\n");
- PRINTVALSTREAM(rawoutstream, "   -N, --nan\n");
- PRINTVALSTREAM(rawoutstream, "         Avoid NaNs detection\n");
- PRINTVALSTREAM(rawoutstream, "   -n C, --count=C\n");
- PRINTVALSTREAM(rawoutstream, "         Print differences up to C. C must be a positive integer.\n");
- PRINTVALSTREAM(rawoutstream, "   -d D, --delta=D\n");
- PRINTVALSTREAM(rawoutstream, "         Print difference if (|a-b| > D). D must be a positive number. Where a\n");
- PRINTVALSTREAM(rawoutstream, "         is the data point value in file1 and b is the data point value in file2.\n");
- PRINTVALSTREAM(rawoutstream, "         Can not use with '-p' or '--use-system-epsilon'.\n");
- PRINTVALSTREAM(rawoutstream, "   -p R, --relative=R\n");
- PRINTVALSTREAM(rawoutstream, "         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a\n");
- PRINTVALSTREAM(rawoutstream, "         is the data point value in file1 and b is the data point value in file2.\n");
- PRINTVALSTREAM(rawoutstream, "         Can not use with '-d' or '--use-system-epsilon'.\n");
- PRINTVALSTREAM(rawoutstream, "   --use-system-epsilon\n");
- PRINTVALSTREAM(rawoutstream, "         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a\n");
- PRINTVALSTREAM(rawoutstream, "         is the data point value in file1 and b is the data point value in file2.\n");
- PRINTVALSTREAM(rawoutstream, "         If the system epsilon is not defined,one of the following predefined\n");
- PRINTVALSTREAM(rawoutstream, "         values will be used:\n");
- PRINTVALSTREAM(rawoutstream, "           FLT_EPSILON = 1.19209E-07 for floating-point type\n");
- PRINTVALSTREAM(rawoutstream, "           DBL_EPSILON = 2.22045E-16 for double precision type\n");
- PRINTVALSTREAM(rawoutstream, "         Can not use with '-p' or '-d'.\n");
- PRINTVALSTREAM(rawoutstream, "   --exclude-path \"path\"\n");
- PRINTVALSTREAM(rawoutstream, "         Exclude the specified path to an object when comparing files or groups.\n");
- PRINTVALSTREAM(rawoutstream, "         If a group is excluded, all member objects will also be excluded.\n");
- PRINTVALSTREAM(rawoutstream, "         The specified path is excluded wherever it occurs.\n");
- PRINTVALSTREAM(rawoutstream, "         This flexibility enables the same option to exclude either objects that\n");
- PRINTVALSTREAM(rawoutstream, "         exist only in one file or common objects that are known to differ.\n");
- PRINTVALSTREAM(rawoutstream, "\n");
- PRINTVALSTREAM(rawoutstream, "         When comparing files, \"path\" is the absolute path to the excluded;\n");
- PRINTVALSTREAM(rawoutstream, "         object; when comparing groups, \"path\" is similar to the relative\n");
- PRINTVALSTREAM(rawoutstream, "         path from the group to the excluded object. This \"path\" can be\n");
- PRINTVALSTREAM(rawoutstream, "         taken from the first section of the output of the --verbose option.\n");
- PRINTVALSTREAM(rawoutstream, "         For example, if you are comparing the group /groupA in two files and\n");
- PRINTVALSTREAM(rawoutstream, "         you want to exclude /groupA/groupB/groupC in both files, the exclude\n");
- PRINTVALSTREAM(rawoutstream, "         option would read as follows:\n");
- PRINTVALSTREAM(rawoutstream, "           --exclude-path \"/groupB/groupC\"\n");
- PRINTVALSTREAM(rawoutstream, "\n");
- PRINTVALSTREAM(rawoutstream, "         If there are multiple paths to an object, only the specified path(s)\n");
- PRINTVALSTREAM(rawoutstream, "         will be excluded; the comparison will include any path not explicitly\n");
- PRINTVALSTREAM(rawoutstream, "         excluded.\n");
- PRINTVALSTREAM(rawoutstream, "         This option can be used repeatedly to exclude multiple paths.\n");
- PRINTVALSTREAM(rawoutstream, "\n");
-
- PRINTVALSTREAM(rawoutstream, " Modes of output:\n");
- PRINTVALSTREAM(rawoutstream, "  Default mode: print the number of differences found and where they occured\n");
- PRINTVALSTREAM(rawoutstream, "  -r Report mode: print the above plus the differences\n");
- PRINTVALSTREAM(rawoutstream, "  -v Verbose mode: print the above plus a list of objects and warnings\n");
- PRINTVALSTREAM(rawoutstream, "  -q Quiet mode: do not print output\n");
-
- PRINTVALSTREAM(rawoutstream, "\n");
-
- PRINTVALSTREAM(rawoutstream, " File comparison:\n");
- PRINTVALSTREAM(rawoutstream, "  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as\n");
- PRINTVALSTREAM(rawoutstream, "  a comparison of the two files' root groups.  That is, h5diff first compares\n");
- PRINTVALSTREAM(rawoutstream, "  the names of root group members, generates a report of root group objects\n");
- PRINTVALSTREAM(rawoutstream, "  that appear in only one file or in both files, and recursively compares\n");
- PRINTVALSTREAM(rawoutstream, "  common objects.\n");
- PRINTVALSTREAM(rawoutstream, "\n");
-
- PRINTVALSTREAM(rawoutstream, " Object comparison:\n");
- PRINTVALSTREAM(rawoutstream, "  1) Groups\n");
- PRINTVALSTREAM(rawoutstream, "      First compares the names of member objects (relative path, from the\n");
- PRINTVALSTREAM(rawoutstream, "      specified group) and generates a report of objects that appear in only\n");
- PRINTVALSTREAM(rawoutstream, "      one group or in both groups. Common objects are then compared recursively.\n");
- PRINTVALSTREAM(rawoutstream, "  2) Datasets\n");
- PRINTVALSTREAM(rawoutstream, "      Array rank and dimensions, datatypes, and data values are compared.\n");
- PRINTVALSTREAM(rawoutstream, "  3) Datatypes\n");
- PRINTVALSTREAM(rawoutstream, "      The comparison is based on the return value of H5Tequal.\n");
- PRINTVALSTREAM(rawoutstream, "  4) Symbolic links\n");
- PRINTVALSTREAM(rawoutstream, "      The paths to the target objects are compared.\n");
- PRINTVALSTREAM(rawoutstream, "      (The option --follow-symlinks overrides the default behavior when\n");
- PRINTVALSTREAM(rawoutstream, "       symbolic links are compared.).\n");
- PRINTVALSTREAM(rawoutstream, "\n");
-
- PRINTVALSTREAM(rawoutstream, " Exit code:\n");
- PRINTVALSTREAM(rawoutstream, "  0 if no differences, 1 if differences found, 2 if error\n");
- PRINTVALSTREAM(rawoutstream, "\n");
- PRINTVALSTREAM(rawoutstream, " Examples of use:\n");
- PRINTVALSTREAM(rawoutstream, " 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
- PRINTVALSTREAM(rawoutstream, "    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
- PRINTVALSTREAM(rawoutstream, "\n");
- PRINTVALSTREAM(rawoutstream, " 2) h5diff file1 file2 /g1/dset1\n");
- PRINTVALSTREAM(rawoutstream, "    Compares object '/g1/dset1' in both files\n");
- PRINTVALSTREAM(rawoutstream, "\n");
- PRINTVALSTREAM(rawoutstream, " 3) h5diff file1 file2\n");
- PRINTVALSTREAM(rawoutstream, "    Compares all objects in both files\n");
- PRINTVALSTREAM(rawoutstream, "\n");
- PRINTVALSTREAM(rawoutstream, " Notes:\n");
- PRINTVALSTREAM(rawoutstream, "  file1 and file2 can be the same file.\n");
- PRINTVALSTREAM(rawoutstream, "  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare\n");
- PRINTVALSTREAM(rawoutstream, "  '/g1/dset1' and '/g1/dset2' in the same file\n");
- PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]\n");
+    PRINTVALSTREAM(rawoutstream, "  file1             File name of the first HDF5 file\n");
+    PRINTVALSTREAM(rawoutstream, "  file2             File name of the second HDF5 file\n");
+    PRINTVALSTREAM(rawoutstream, "  [obj1]            Name of an HDF5 object, in absolute path\n");
+    PRINTVALSTREAM(rawoutstream, "  [obj2]            Name of an HDF5 object, in absolute path\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "  ERROR\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --enable-error-stack Prints messages from the HDF5 error stack as they occur.\n");
+    PRINTVALSTREAM(rawoutstream, "                        Optional value 2 also prints file open errors.\n");
+    PRINTVALSTREAM(rawoutstream, "  OPTIONS\n");
+    PRINTVALSTREAM(rawoutstream, "   -h, --help\n");
+    PRINTVALSTREAM(rawoutstream, "         Print a usage message and exit.\n");
+    PRINTVALSTREAM(rawoutstream, "   -V, --version\n");
+    PRINTVALSTREAM(rawoutstream, "         Print version number and exit.\n");
+    PRINTVALSTREAM(rawoutstream, "   -r, --report\n");
+    PRINTVALSTREAM(rawoutstream, "         Report mode. Print differences.\n");
+    PRINTVALSTREAM(rawoutstream, "   -v --verbose\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Verbose mode. Print differences information and list of objects.\n");
+    PRINTVALSTREAM(rawoutstream, "   -vN --verbose=N\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Verbose mode with level. Print differences and list of objects.\n");
+    PRINTVALSTREAM(rawoutstream, "         Level of detail depends on value of N:\n");
+    PRINTVALSTREAM(rawoutstream, "          0 : Identical to '-v' or '--verbose'.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "          1 : All level 0 information plus one-line attribute status summary.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "          2 : All level 1 information plus extended attribute status report.\n");
+    PRINTVALSTREAM(rawoutstream, "          3 : All level 2 information plus file names.\n");
+    PRINTVALSTREAM(rawoutstream, "   -q, --quiet\n");
+    PRINTVALSTREAM(rawoutstream, "         Quiet mode. Do not produce output.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-value-1           Value (ID) of the VOL connector to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                           first HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-name-1            Name of the VOL connector to use for opening the first\n");
+    PRINTVALSTREAM(rawoutstream, "                           HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-info-1            VOL-specific info to pass to the VOL connector used for\n");
+    PRINTVALSTREAM(rawoutstream, "                           opening the first HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-value-2           Value (ID) of the VOL connector to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                           second HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-name-2            Name of the VOL connector to use for opening the second\n");
+    PRINTVALSTREAM(rawoutstream, "                           HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-info-2            VOL-specific info to pass to the VOL connector used for\n");
+    PRINTVALSTREAM(rawoutstream, "                           opening the second HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vfd-value-1           Value (ID) of the VFL driver to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                           first HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vfd-name-1            Name of the VFL driver to use for opening the first\n");
+    PRINTVALSTREAM(rawoutstream, "                           HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vfd-info-1            VFD-specific info to pass to the VFL driver used for\n");
+    PRINTVALSTREAM(rawoutstream, "                           opening the first HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vfd-value-2           Value (ID) of the VFL driver to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                           second HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vfd-name-2            Name of the VFL driver to use for opening the second\n");
+    PRINTVALSTREAM(rawoutstream, "                           HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vfd-info-2            VFD-specific info to pass to the VFL driver used for\n");
+    PRINTVALSTREAM(rawoutstream, "                           opening the second HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream, "   --follow-symlinks\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Follow symbolic links (soft links and external links and compare the)\n");
+    PRINTVALSTREAM(rawoutstream, "         links' target objects.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         If symbolic link(s) with the same name exist in the files being\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         compared, then determine whether the target of each link is an existing\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         object (dataset, group, or named datatype) or the link is a dangling\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         link (a soft or external link pointing to a target object that does\n");
+    PRINTVALSTREAM(rawoutstream, "         not yet exist).\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         - If both symbolic links are dangling links, they are treated as being\n");
+    PRINTVALSTREAM(rawoutstream, "           the same; by default, h5diff returns an exit code of 0.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "           If, however, --no-dangling-links is used with --follow-symlinks,\n");
+    PRINTVALSTREAM(rawoutstream, "           this situation is treated as an error and h5diff returns an\n");
+    PRINTVALSTREAM(rawoutstream, "           exit code of 2.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         - If only one of the two links is a dangling link,they are treated as\n");
+    PRINTVALSTREAM(rawoutstream, "           being different and h5diff returns an exit code of 1.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "           If, however, --no-dangling-links is used with --follow-symlinks,\n");
+    PRINTVALSTREAM(rawoutstream, "           this situation is treated as an error and h5diff returns an\n");
+    PRINTVALSTREAM(rawoutstream, "           exit code of 2.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         - If both symbolic links point to existing objects, h5diff compares the\n");
+    PRINTVALSTREAM(rawoutstream, "           two objects.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         If any symbolic link specified in the call to h5diff does not exist,\n");
+    PRINTVALSTREAM(rawoutstream, "         h5diff treats it as an error and returns an exit code of 2.\n");
+    PRINTVALSTREAM(rawoutstream, "   --no-dangling-links\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Must be used with --follow-symlinks option; otherwise, h5diff shows\n");
+    PRINTVALSTREAM(rawoutstream, "         error message and returns an exit code of 2.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Check for any symbolic links (soft links or external links) that do not\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         resolve to an existing object (dataset, group, or named datatype).\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         If any dangling link is found, this situation is treated as an error\n");
+    PRINTVALSTREAM(rawoutstream, "         and h5diff returns an exit code of 2.\n");
+    PRINTVALSTREAM(rawoutstream, "   -c, --compare\n");
+    PRINTVALSTREAM(rawoutstream, "         List objects that are not comparable\n");
+    PRINTVALSTREAM(rawoutstream, "   -N, --nan\n");
+    PRINTVALSTREAM(rawoutstream, "         Avoid NaNs detection\n");
+    PRINTVALSTREAM(rawoutstream, "   -n C, --count=C\n");
+    PRINTVALSTREAM(rawoutstream, "         Print differences up to C. C must be a positive integer.\n");
+    PRINTVALSTREAM(rawoutstream, "   -d D, --delta=D\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Print difference if (|a-b| > D). D must be a positive number. Where a\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         is the data point value in file1 and b is the data point value in file2.\n");
+    PRINTVALSTREAM(rawoutstream, "         Can not use with '-p' or '--use-system-epsilon'.\n");
+    PRINTVALSTREAM(rawoutstream, "   -p R, --relative=R\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         is the data point value in file1 and b is the data point value in file2.\n");
+    PRINTVALSTREAM(rawoutstream, "         Can not use with '-d' or '--use-system-epsilon'.\n");
+    PRINTVALSTREAM(rawoutstream, "   --use-system-epsilon\n");
+    PRINTVALSTREAM(
+        rawoutstream,
+        "         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         is the data point value in file1 and b is the data point value in file2.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         If the system epsilon is not defined,one of the following predefined\n");
+    PRINTVALSTREAM(rawoutstream, "         values will be used:\n");
+    PRINTVALSTREAM(rawoutstream, "           FLT_EPSILON = 1.19209E-07 for floating-point type\n");
+    PRINTVALSTREAM(rawoutstream, "           DBL_EPSILON = 2.22045E-16 for double precision type\n");
+    PRINTVALSTREAM(rawoutstream, "         Can not use with '-p' or '-d'.\n");
+    PRINTVALSTREAM(rawoutstream, "   --exclude-path \"path\"\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         Exclude the specified path to an object when comparing files or groups.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         If a group is excluded, all member objects will also be excluded.\n");
+    PRINTVALSTREAM(rawoutstream, "         The specified path is excluded wherever it occurs.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         This flexibility enables the same option to exclude either objects that\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         exist only in one file or common objects that are known to differ.\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         When comparing files, \"path\" is the absolute path to the excluded;\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         object; when comparing groups, \"path\" is similar to the relative\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         path from the group to the excluded object. This \"path\" can be\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         taken from the first section of the output of the --verbose option.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         For example, if you are comparing the group /groupA in two files and\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         you want to exclude /groupA/groupB/groupC in both files, the exclude\n");
+    PRINTVALSTREAM(rawoutstream, "         option would read as follows:\n");
+    PRINTVALSTREAM(rawoutstream, "           --exclude-path \"/groupB/groupC\"\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         If there are multiple paths to an object, only the specified path(s)\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         will be excluded; the comparison will include any path not explicitly\n");
+    PRINTVALSTREAM(rawoutstream, "         excluded.\n");
+    PRINTVALSTREAM(rawoutstream, "         This option can be used repeatedly to exclude multiple paths.\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "   --exclude-attribute \"path/to/object/with/attribute\"\n");
+    PRINTVALSTREAM(
+        rawoutstream,
+        "         Exclude attributes on the specified path to an object when comparing files or groups.\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         If there are multiple paths to an object, only the specified path(s)\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "         will be excluded; the comparison will include any path not explicitly\n");
+    PRINTVALSTREAM(rawoutstream, "         excluded.\n");
+    PRINTVALSTREAM(rawoutstream, "         This option can be used repeatedly to exclude multiple paths.\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, " Modes of output:\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  Default mode: print the number of differences found and where they occurred\n");
+    PRINTVALSTREAM(rawoutstream, "  -r Report mode: print the above plus the differences\n");
+    PRINTVALSTREAM(rawoutstream, "  -v Verbose mode: print the above plus a list of objects and warnings\n");
+    PRINTVALSTREAM(rawoutstream, "  -q Quiet mode: do not print output\n");
+
+    PRINTVALSTREAM(rawoutstream, "\n");
+
+    PRINTVALSTREAM(rawoutstream, " File comparison:\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  a comparison of the two files' root groups.  That is, h5diff first compares\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  the names of root group members, generates a report of root group objects\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  that appear in only one file or in both files, and recursively compares\n");
+    PRINTVALSTREAM(rawoutstream, "  common objects.\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+
+    PRINTVALSTREAM(rawoutstream, " Object comparison:\n");
+    PRINTVALSTREAM(rawoutstream, "  1) Groups\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      First compares the names of member objects (relative path, from the\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      specified group) and generates a report of objects that appear in only\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      one group or in both groups. Common objects are then compared recursively.\n");
+    PRINTVALSTREAM(rawoutstream, "  2) Datasets\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "      Array rank and dimensions, datatypes, and data values are compared.\n");
+    PRINTVALSTREAM(rawoutstream, "  3) Datatypes\n");
+    PRINTVALSTREAM(rawoutstream, "      The comparison is based on the return value of H5Tequal.\n");
+    PRINTVALSTREAM(rawoutstream, "  4) Symbolic links\n");
+    PRINTVALSTREAM(rawoutstream, "      The paths to the target objects are compared.\n");
+    PRINTVALSTREAM(rawoutstream, "      (The option --follow-symlinks overrides the default behavior when\n");
+    PRINTVALSTREAM(rawoutstream, "       symbolic links are compared.).\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    /*
+     * TRILABS_227 is complete except for an issue with printing indices
+     * the following will be needed for subsetting
+     */
+    PRINTVALSTREAM(rawoutstream, " Subsetting options:\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  Subsetting is available by using the fcompact form of subsetting, as follows:\n");
+    PRINTVALSTREAM(rawoutstream, "    obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  It is not required to use all parameters, but until the last parameter value used,\n");
+    PRINTVALSTREAM(
+        rawoutstream,
+        "  all of the semicolons (;) are required, even when a parameter value is not specified. Example:\n");
+    PRINTVALSTREAM(rawoutstream, "    obj1 /foo/mydataset[START;;COUNT;BLOCK]\n");
+    PRINTVALSTREAM(rawoutstream, "    obj1 /foo/mydataset[START]\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "  each dimension. START is optional and will default to 0 in each dimension.\n");
+    PRINTVALSTREAM(
+        rawoutstream,
+        "  Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with\n");
+    PRINTVALSTREAM(rawoutstream, "  one integer for each dimension of the dataset.\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, " Exit code:\n");
+    PRINTVALSTREAM(rawoutstream, "  0 if no differences, 1 if differences found, 2 if error\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, " Examples of use:\n");
+    PRINTVALSTREAM(rawoutstream, " 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
+    PRINTVALSTREAM(rawoutstream, "    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, " 2) h5diff file1 file2 /g1/dset1\n");
+    PRINTVALSTREAM(rawoutstream, "    Compares object '/g1/dset1' in both files\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, " 3) h5diff file1 file2\n");
+    PRINTVALSTREAM(rawoutstream, "    Compares all objects in both files\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, " Notes:\n");
+    PRINTVALSTREAM(rawoutstream, "  file1 and file2 can be the same file.\n");
+    PRINTVALSTREAM(rawoutstream, "  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare\n");
+    PRINTVALSTREAM(rawoutstream, "  '/g1/dset1' and '/g1/dset2' in the same file\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
 }
diff --git a/tools/src/h5diff/h5diff_common.h b/tools/src/h5diff/h5diff_common.h
index dc0676c..35e5dfb 100644
--- a/tools/src/h5diff/h5diff_common.h
+++ b/tools/src/h5diff/h5diff_common.h
@@ -6,13 +6,13 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef H5DIFFCOMMON_H__
-#define H5DIFFCOMMON_H__
+#ifndef H5DIFFCOMMON_H
+#define H5DIFFCOMMON_H
 
 #include "h5tools.h"
 /* Name of tool */
@@ -23,12 +23,13 @@ extern "C" {
 #endif
 
 void usage(void);
-void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* opts);
+void parse_command_line(int argc, const char *const *argv, const char **fname1, const char **fname2,
+                        const char **objname1, const char **objname2, diff_opt_t *opts);
 void h5diff_exit(int status);
-void print_info(diff_opt_t* opts);
+void print_info(diff_opt_t *opts);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* H5DIFFCOMMON_H__ */
+#endif /* H5DIFFCOMMON_H */
diff --git a/tools/src/h5diff/h5diff_main.c b/tools/src/h5diff/h5diff_main.c
index c5a0cbf..2a43b56 100644
--- a/tools/src/h5diff/h5diff_main.c
+++ b/tools/src/h5diff/h5diff_main.c
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -17,7 +17,6 @@
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -26,7 +25,7 @@
  * Return: An  exit status of 0 means no differences were found, 1 means some
  *   differences were found.
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: May 9, 2003
  *
@@ -34,7 +33,7 @@
  *
  * Modifications: July 2004
  *  Introduced the four modes:
- *   Normal mode: print the number of differences found and where they occured
+ *   Normal mode: print the number of differences found and where they occurred
  *   Report mode: print the above plus the differences
  *   Verbose mode: print the above plus a list of objects and warnings
  *   Quiet mode: do not print output
@@ -65,60 +64,47 @@
  *-------------------------------------------------------------------------
  */
 
-
-int main(int argc, const char *argv[])
+int
+main(int argc, char *argv[])
 {
-    int        ret;
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
-    void               *edata;
-    void               *tools_edata;
-    const char *fname1 = NULL;
-    const char *fname2 = NULL;
-    const char *objname1  = NULL;
-    const char *objname2  = NULL;
-    hsize_t    nfound=0;
-    diff_opt_t opts;
+    int         ret;
+    int         i;
+    const char *fname1   = NULL;
+    const char *fname2   = NULL;
+    const char *objname1 = NULL;
+    const char *objname2 = NULL;
+    hsize_t     nfound   = 0;
+    diff_opt_t  opts;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable tools error reporting */
-    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
-    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
-
     /*-------------------------------------------------------------------------
-    * process the command-line
-    *-------------------------------------------------------------------------
-    */
-    parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
-
-    if (enable_error_stack > 0) {
-        H5Eset_auto2(H5E_DEFAULT, func, edata);
-        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
-    }
+     * process the command-line
+     *-------------------------------------------------------------------------
+     */
+    parse_command_line(argc, (const char *const *)argv, &fname1, &fname2, &objname1, &objname2, &opts);
+
+    /* enable error reporting if command line option */
+    h5tools_error_report();
 
     /*-------------------------------------------------------------------------
-    * do the diff
-    *-------------------------------------------------------------------------
-    */
+     * do the diff
+     *-------------------------------------------------------------------------
+     */
 
     nfound = h5diff(fname1, fname2, objname1, objname2, &opts);
 
     print_info(&opts);
 
-   /*-------------------------------------------------------------------------
-    * exit code
-    *   1 if differences, 0 if no differences, 2 if error
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * exit code
+     *   1 if differences, 0 if no differences, 2 if error
+     *-------------------------------------------------------------------------
+     */
 
     ret = (nfound == 0 ? 0 : 1);
 
@@ -130,6 +116,23 @@ int main(int argc, const char *argv[])
     if (opts.err_stat)
         ret = 2;
 
+    /* free any buffers */
+    for (i = 0; i < 2; i++) {
+        if (opts.sset[i]) {
+            if (opts.sset[i]->start.data)
+                HDfree(opts.sset[i]->start.data);
+            if (opts.sset[i]->stride.data)
+                HDfree(opts.sset[i]->stride.data);
+            if (opts.sset[i]->count.data)
+                HDfree(opts.sset[i]->count.data);
+            if (opts.sset[i]->block.data)
+                HDfree(opts.sset[i]->block.data);
+
+            HDfree(opts.sset[i]);
+            opts.sset[i] = NULL;
+        }
+    }
+
     h5diff_exit(ret);
 }
 
@@ -156,4 +159,3 @@ h5diff_exit(int status)
 
     HDexit(status);
 }
-
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index 380ab3b..8e5c3e8 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -21,7 +21,7 @@
 /* Name of tool */
 #define PROGRAMNAME "h5diff"
 
-static void ph5diff_worker(int );
+static void ph5diff_worker(int);
 
 /*-------------------------------------------------------------------------
  * Function: main
@@ -31,7 +31,7 @@ static void ph5diff_worker(int );
  * Return: An exit status of 0 means no differences were found, 1 means some
  *   differences were found.
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: May 9, 2003
  *
@@ -43,14 +43,15 @@ static void ph5diff_worker(int );
  *-------------------------------------------------------------------------
  */
 
-int main(int argc, const char *argv[])
+int
+main(int argc, char *argv[])
 {
-    int        nID = 0;
-    const char *fname1 = NULL;
-    const char *fname2 = NULL;
-    const char *objname1  = NULL;
-    const char *objname2  = NULL;
-    diff_opt_t opts;
+    int         nID      = 0;
+    const char *fname1   = NULL;
+    const char *fname2   = NULL;
+    const char *objname1 = NULL;
+    const char *objname2 = NULL;
+    diff_opt_t  opts;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -59,20 +60,19 @@ int main(int argc, const char *argv[])
     h5tools_init();
 
     outBuffOffset = 0;
-    g_Parallel = 1;
+    g_Parallel    = 1;
 
-    MPI_Init(&argc, (char***) &argv);
+    MPI_Init(&argc, (char ***)&argv);
 
     MPI_Comm_rank(MPI_COMM_WORLD, &nID);
     MPI_Comm_size(MPI_COMM_WORLD, &g_nTasks);
 
-    if(g_nTasks == 1)
-    {
+    if (g_nTasks == 1) {
         HDprintf("Only 1 task available...doing serial diff\n");
 
         g_Parallel = 0;
 
-        parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
+        parse_command_line(argc, (const char *const *)argv, &fname1, &fname2, &objname1, &objname2, &opts);
 
         h5diff(fname1, fname2, objname1, objname2, &opts);
 
@@ -82,9 +82,9 @@ int main(int argc, const char *argv[])
     else {
 
         /* Have the manager process the command-line */
-        if(nID == 0)
-        {
-            parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
+        if (nID == 0) {
+            parse_command_line(argc, (const char *const *)argv, &fname1, &fname2, &objname1, &objname2,
+                               &opts);
 
             h5diff(fname1, fname2, objname1, objname2, &opts);
 
@@ -126,33 +126,30 @@ int main(int argc, const char *argv[])
 static void
 ph5diff_worker(int nID)
 {
-    hid_t file1_id = -1, file2_id = -1;
+    hid_t file1_id = H5I_INVALID_HID;
+    hid_t file2_id = H5I_INVALID_HID;
 
-    while(1)
-    {
+    while (1) {
         MPI_Status Status;
 
         MPI_Probe(0, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
 
         /* Check for filenames */
-        if(Status.MPI_TAG == MPI_TAG_PARALLEL)
-        {
-            char    filenames[2][MAX_FILENAME];
+        if (Status.MPI_TAG == MPI_TAG_PARALLEL) {
+            char filenames[2][MAX_FILENAME];
 
             /* Retrieve filenames */
-            MPI_Recv(filenames, MAX_FILENAME*2, MPI_CHAR, 0, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
+            MPI_Recv(filenames, MAX_FILENAME * 2, MPI_CHAR, 0, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
 
             /* disable error reporting */
             H5E_BEGIN_TRY
             {
                 /* Open the files */
-                if ((file1_id = H5Fopen (filenames[0], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-                {
+                if ((file1_id = H5Fopen(filenames[0], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
                     HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
-                if ((file2_id = H5Fopen (filenames[1], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-                {
+                if ((file2_id = H5Fopen(filenames[1], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
                     HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
@@ -161,15 +158,13 @@ ph5diff_worker(int nID)
             H5E_END_TRY;
         }
         /* Check for work */
-        else if(Status.MPI_TAG == MPI_TAG_ARGS)
-        {
+        else if (Status.MPI_TAG == MPI_TAG_ARGS) {
             struct diff_mpi_args args;
-            struct diffs_found  diffs;
-            int i;
+            struct diffs_found   diffs;
+            unsigned             i;
 
             /* Make certain we've received the filenames and opened the files already */
-            if(file1_id < 0 || file2_id < 0)
-            {
+            if (file1_id < 0 || file2_id < 0) {
                 HDprintf("ph5diff_worker: ERROR: work received before/without filenames\n");
                 break;
             }
@@ -178,44 +173,43 @@ ph5diff_worker(int nID)
             MPI_Recv(&args, sizeof(args), MPI_BYTE, 0, MPI_TAG_ARGS, MPI_COMM_WORLD, &Status);
 
             /* Do the diff */
-            diffs.nfound = diff(file1_id, args.name1, file2_id, args.name2, &(args.opts), &(args.argdata));
+            diffs.nfound  = diff(file1_id, args.name1, file2_id, args.name2, &(args.opts), &(args.argdata));
             diffs.not_cmp = args.opts.not_cmp;
 
             /* If print buffer has something in it, request print token.*/
-            if(outBuffOffset>0)
-            {
+            if (outBuffOffset > 0) {
                 MPI_Send(NULL, 0, MPI_BYTE, 0, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD);
 
                 /* Wait for print token. */
                 MPI_Recv(NULL, 0, MPI_BYTE, 0, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD, &Status);
 
                 /* When get token, send all of our output to the manager task and then return the token */
-                for(i=0; i<outBuffOffset; i+=PRINT_DATA_MAX_SIZE)
-                    MPI_Send(outBuff+i, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD);
+                for (i = 0; i < outBuffOffset; i += PRINT_DATA_MAX_SIZE)
+                    MPI_Send(outBuff + i, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA,
+                             MPI_COMM_WORLD);
 
                 /* An overflow file exists, so we send it's output to the manager too and then delete it */
-                if(overflow_file)
-                {
+                if (overflow_file) {
                     char out_data[PRINT_DATA_MAX_SIZE];
-                    int tmp;
+                    int  tmp;
 
                     HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE);
-                    i=0;
+                    i = 0;
 
                     rewind(overflow_file);
-                    while((tmp = getc(overflow_file)) >= 0)
-                    {
+                    while ((tmp = getc(overflow_file)) >= 0) {
                         *(out_data + i++) = (char)tmp;
-                        if(i==PRINT_DATA_MAX_SIZE)
-                        {
-                            MPI_Send(out_data, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD);
-                            i=0;
+                        if (i == PRINT_DATA_MAX_SIZE) {
+                            MPI_Send(out_data, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA,
+                                     MPI_COMM_WORLD);
+                            i = 0;
                             HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE);
                         }
                     }
 
-                    if(i>0)
-                        MPI_Send(out_data, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD);
+                    if (i > 0)
+                        MPI_Send(out_data, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA,
+                                 MPI_COMM_WORLD);
 
                     fclose(overflow_file);
                     overflow_file = NULL;
@@ -231,17 +225,14 @@ ph5diff_worker(int nID)
                 MPI_Send(&diffs, sizeof(diffs), MPI_BYTE, 0, MPI_TAG_DONE, MPI_COMM_WORLD);
         }
         /* Check for leaving */
-        else if(Status.MPI_TAG == MPI_TAG_END)
-        {
+        else if (Status.MPI_TAG == MPI_TAG_END) {
             MPI_Recv(NULL, 0, MPI_BYTE, 0, MPI_TAG_END, MPI_COMM_WORLD, &Status);
             break;
         }
-        else
-        {
+        else {
             HDprintf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG);
             break;
         }
-
     }
 
     return;
@@ -261,18 +252,17 @@ ph5diff_worker(int nID)
  *
  *-------------------------------------------------------------------------
  */
-void print_manager_output(void)
+void
+print_manager_output(void)
 {
     /* If there was something we buffered, let's print it now */
-    if( (outBuffOffset>0) && g_Parallel)
-    {
+    if ((outBuffOffset > 0) && g_Parallel) {
         HDprintf("%s", outBuff);
 
-        if(overflow_file)
-        {
-            int     tmp;
+        if (overflow_file) {
+            int tmp;
             rewind(overflow_file);
-            while((tmp = HDgetc(overflow_file)) >= 0)
+            while ((tmp = HDgetc(overflow_file)) >= 0)
                 HDputchar(tmp);
             fclose(overflow_file);
             overflow_file = NULL;
@@ -282,8 +272,7 @@ void print_manager_output(void)
         HDmemset(outBuff, 0, OUTBUFF_SIZE);
         outBuffOffset = 0;
     }
-    else if( (outBuffOffset>0) && !g_Parallel)
-    {
+    else if ((outBuffOffset > 0) && !g_Parallel) {
         HDfprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n");
     }
 }
@@ -304,16 +293,18 @@ void print_manager_output(void)
  *
  *-------------------------------------------------------------------------
  */
-void h5diff_exit(int status)
+void
+h5diff_exit(int status)
 {
     /* if in parallel mode, dismiss workers, close down MPI, then exit */
-    if(g_Parallel) {
-        if(g_nTasks > 1) {
+    if (g_Parallel) {
+        if (g_nTasks > 1) {
             phdiff_dismiss_workers();
             MPI_Barrier(MPI_COMM_WORLD);
         }
         MPI_Finalize();
-        status = EXIT_SUCCESS;  /* Reset exit status, since some mpiexec commands generate output on failure status */
+        status = EXIT_SUCCESS; /* Reset exit status, since some mpiexec commands generate output on failure
+                                  status */
     }
 
     h5tools_close();
@@ -323,4 +314,3 @@ void h5diff_exit(int status)
      */
     HDexit(0);
 }
-