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

4 files changed, 20 insertions, 20 deletions

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)