Basic alignment with async branch (#115)

* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.

* Update minor error code to reflect change within library

* Update the error output to match library

8 files changed, 31 insertions, 31 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index ec83d91..aa72998 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 b998784..b3efeab 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 533237c..01577db 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/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 80873fd..969dbab 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -613,7 +613,7 @@ test_populate_ros3_fa(void)
 
     hbool_t show_progress = FALSE;
     int     bad_version   = 0xf87a; /* arbitrarily wrong version number */
-#endif                              /* H5_HAVE_ROS3_VFD */
+#endif /* H5_HAVE_ROS3_VFD */
 
     TESTING("programmatic ros3 fapl population");
 
@@ -1028,7 +1028,7 @@ test_set_configured_fapl(void)
         "",   /* user name             */
         2048, /* stream buffer size    */
     };
-#endif                    /* H5_HAVE_LIBHDFS */
+#endif /* H5_HAVE_LIBHDFS */
     unsigned n_cases = 7; /* number of common testcases */
     testcase cases[] = {
         {
@@ -1279,7 +1279,7 @@ main(void)
 
 #ifdef _H5TEST_
     h5reset(); /* h5test? */
-#endif         /* _H5TEST_ */
+#endif /* _H5TEST_ */
 
     HDfprintf(stdout, "Testing h5tools_utils corpus.\n");
 
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 9e83ff8..6f586cc 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -1,7 +1,7 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
     major: Dataset
-    minor: Unable to initialize object
+    minor: Unable to create file
   #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
     major: Virtual Object Layer
     minor: Unable to create file
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index 22aca04..df4c569 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -465,7 +465,7 @@ parse_args(int argc, char **argv)
  * End:
  */
 
-#else  /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
 /* dummy program since H5_HAVE_PARALLEL is not configured in */
 int
 main(int H5_ATTR_UNUSED argc, char H5_ATTR_UNUSED **argv)
diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h
index d64f421..2f812d7 100644
--- a/tools/test/perform/pio_standalone.h
+++ b/tools/test/perform/pio_standalone.h
@@ -224,14 +224,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
 #define HDisalnum(C)     isalnum((int)(C)) /*cast for solaris warning*/
 #define HDisalpha(C)     isalpha((int)(C)) /*cast for solaris warning*/
 #define HDisatty(F)      isatty(F)
-#define HDiscntrl(C)     iscntrl((int)(C))  /*cast for solaris warning*/
-#define HDisdigit(C)     isdigit((int)(C))  /*cast for solaris warning*/
-#define HDisgraph(C)     isgraph((int)(C))  /*cast for solaris warning*/
-#define HDislower(C)     islower((int)(C))  /*cast for solaris warning*/
-#define HDisprint(C)     isprint((int)(C))  /*cast for solaris warning*/
-#define HDispunct(C)     ispunct((int)(C))  /*cast for solaris warning*/
-#define HDisspace(C)     isspace((int)(C))  /*cast for solaris warning*/
-#define HDisupper(C)     isupper((int)(C))  /*cast for solaris warning*/
+#define HDiscntrl(C)     iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C)     isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C)     isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C)     islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C)     isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C)     ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C)     isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C)     isupper((int)(C)) /*cast for solaris warning*/
 #define HDisxdigit(C)    isxdigit((int)(C)) /*cast for solaris warning*/
 #define HDkill(P, S)     kill(P, S)
 #define HDlabs(X)        labs(X)
@@ -458,7 +458,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 #else /* H5_HAVE_WIN32_API */
 
 #if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *         strdup(const char *s);
+extern char *strdup(const char *s);
 #endif
 
 #define HDstrdup(S) strdup(S)
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index 4001257..c0e0793 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -239,14 +239,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
 #define HDisalnum(C)     isalnum((int)(C)) /*cast for solaris warning*/
 #define HDisalpha(C)     isalpha((int)(C)) /*cast for solaris warning*/
 #define HDisatty(F)      isatty(F)
-#define HDiscntrl(C)     iscntrl((int)(C))  /*cast for solaris warning*/
-#define HDisdigit(C)     isdigit((int)(C))  /*cast for solaris warning*/
-#define HDisgraph(C)     isgraph((int)(C))  /*cast for solaris warning*/
-#define HDislower(C)     islower((int)(C))  /*cast for solaris warning*/
-#define HDisprint(C)     isprint((int)(C))  /*cast for solaris warning*/
-#define HDispunct(C)     ispunct((int)(C))  /*cast for solaris warning*/
-#define HDisspace(C)     isspace((int)(C))  /*cast for solaris warning*/
-#define HDisupper(C)     isupper((int)(C))  /*cast for solaris warning*/
+#define HDiscntrl(C)     iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C)     isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C)     isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C)     islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C)     isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C)     ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C)     isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C)     isupper((int)(C)) /*cast for solaris warning*/
 #define HDisxdigit(C)    isxdigit((int)(C)) /*cast for solaris warning*/
 #define HDkill(P, S)     kill(P, S)
 #define HDlabs(X)        labs(X)
@@ -473,7 +473,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 #else /* H5_HAVE_WIN32_API */
 
 #if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *         strdup(const char *s);
+extern char *strdup(const char *s);
 #endif
 
 #define HDstrdup(S) strdup(S)