Basic alignment with async branch (#115) (#137)

* 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

1 files changed, 6 insertions, 15 deletions

diff --git a/src/H5VM.c b/src/H5VM.c
index a5461e8..72ec045 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -447,13 +447,8 @@ H5VM_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size, con
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VM_hyper_copy(unsigned n, const hsize_t *_size,
-
-                /*destination*/
-                const hsize_t *dst_size, const hsize_t *dst_offset, void *_dst,
-
-                /*source*/
-                const hsize_t *src_size, const hsize_t *src_offset, const void *_src)
+H5VM_hyper_copy(unsigned n, const hsize_t *_size, const hsize_t *dst_size, const hsize_t *dst_offset,
+                void *_dst, const hsize_t *src_size, const hsize_t *src_offset, const void *_src)
 {
     const uint8_t *src = (const uint8_t *)_src;  /*cast for ptr arithmtc */
     uint8_t *      dst = (uint8_t *)_dst;        /*cast for ptr arithmtc */
@@ -491,7 +486,7 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
 #ifdef NO_INLINED_CODE
     dst_start = H5VM_hyper_stride(n, size, dst_size, dst_offset, dst_stride);
     src_start = H5VM_hyper_stride(n, size, src_size, src_offset, src_stride);
-#else  /* NO_INLINED_CODE */
+#else /* NO_INLINED_CODE */
     /* in-line version of two calls to H5VM_hyper_stride() */
     {
         hsize_t dst_acc; /*accumulator				*/
@@ -795,13 +790,9 @@ H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size, const hss
  *-------------------------------------------------------------------------
  */
 static void
-H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size,
-
-                   /* destination */
-                   unsigned dst_n, const hsize_t *dst_size, const hsize_t *dst_stride, void *_dst,
-
-                   /* source */
-                   unsigned src_n, const hsize_t *src_size, const hsize_t *src_stride, const void *_src)
+H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n, const hsize_t *dst_size,
+                   const hsize_t *dst_stride, void *_dst, unsigned src_n, const hsize_t *src_size,
+                   const hsize_t *src_stride, const void *_src)
 {
     uint8_t *      dst = (uint8_t *)_dst;
     const uint8_t *src = (const uint8_t *)_src;