1 12 Whitespace changes after clang-format run (#288)

* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

4 files changed, 13 insertions, 15 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index aa72998..ec83d91 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -692,7 +692,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
             /* Use the asprintf() routine, since it does what we're trying to do below */
             if (HDasprintf(&obj1fullname, "/%s", objname1) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
-#else /* H5_HAVE_ASPRINTF */
+#else  /* H5_HAVE_ASPRINTF */
             /* (malloc 2 more for "/" and end-of-line) */
             if ((obj1fullname = (char *)HDmalloc(HDstrlen(objname1) + 2)) == NULL)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -711,7 +711,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
             /* Use the asprintf() routine, since it does what we're trying to do below */
             if (HDasprintf(&obj2fullname, "/%s", objname2) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
-#else /* H5_HAVE_ASPRINTF */
+#else  /* H5_HAVE_ASPRINTF */
             /* (malloc 2 more for "/" and end-of-line) */
             if ((obj2fullname = (char *)HDmalloc(HDstrlen(objname2) + 2)) == NULL)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1174,7 +1174,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                 if (HDasprintf(&obj1_fullpath, "%s%s", grp1_path, table->objs[i].name) < 0) {
                     H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
                 }
-#else /* H5_HAVE_ASPRINTF */
+#else  /* H5_HAVE_ASPRINTF */
             if ((obj1_fullpath = (char *)HDmalloc(HDstrlen(grp1_path) + HDstrlen(table->objs[i].name) + 1)) ==
                 NULL) {
                 H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1192,7 +1192,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                 if (HDasprintf(&obj2_fullpath, "%s%s", grp2_path, table->objs[i].name) < 0) {
                     H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
                 }
-#else /* H5_HAVE_ASPRINTF */
+#else  /* H5_HAVE_ASPRINTF */
             if ((obj2_fullpath = (char *)HDmalloc(HDstrlen(grp2_path) + HDstrlen(table->objs[i].name) + 1)) ==
                 NULL) {
                 H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1388,7 +1388,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                         }     /* end else */
                     }         /* end if */
                 }             /* end else */
-#endif /* H5_HAVE_PARALLEL */
+#endif                        /* H5_HAVE_PARALLEL */
                 if (obj1_fullpath)
                     HDfree(obj1_fullpath);
                 if (obj2_fullpath)
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index b3efeab..b998784 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -1279,7 +1279,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
                 }
                 nfound += diff_ldouble_element(mem1, mem2, elemtno, opts);
             } /*H5T_NATIVE_LDOUBLE*/
-#endif /* H5_SIZEOF_LONG_DOUBLE */
+#endif        /* H5_SIZEOF_LONG_DOUBLE */
 
             break; /* H5T_FLOAT class */
 
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 01577db..533237c 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -932,7 +932,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
                     }
                 } /* end if (sizeof(long long) == nsize) */
-#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
+#endif            /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
                 break;
 
             case H5T_COMPOUND:
@@ -1268,7 +1268,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         for (x = 0; x < ctx->indent_level + 1; x++)
                             h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
                     } /* end if */
-#endif /* LATER */
+#endif                /* LATER */
 
                     ctx->indent_level++;
 
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 9c5999b..4d39816 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -194,10 +194,10 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
 
     if (sp == 1 && argv[opt_ind][0] == '-' && argv[opt_ind][1] == '-') {
         /* long command line option */
-        int         i;
-        const char  ch = '=';
-        char *arg = &argv[opt_ind][2];
-        size_t arg_len = 0;
+        int        i;
+        const char ch      = '=';
+        char *     arg     = &argv[opt_ind][2];
+        size_t     arg_len = 0;
 
         opt_arg = strchr(&argv[opt_ind][2], ch);
         arg_len = HDstrlen(&argv[opt_ind][2]);
@@ -224,7 +224,7 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
                         else if (l_opts[i].has_arg == require_arg) {
                             if (opt_err)
                                 HDfprintf(rawerrorstream, "%s: option required for \"--%s\" flag\n", argv[0],
-                                        arg);
+                                          arg);
 
                             opt_opt = '?';
                         }
@@ -384,8 +384,6 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
  * Programmer: Jacob Smith
  *             2017-11-10
  *
- * Changes: None.
- *
  *****************************************************************************
  */
 herr_t