Merge PRs in issue #642 to hdf5_1_12 (#643)

* Snapshot version 1.12 release 1-3.  Update  version to 1.12.1-4.

* First cut of the H5 public API documentation. (#80)

* First cut of the H5 public API documentation.

* Added H5Z "bonus track."

* Applied Quincey's patch.

* Added the missing patches from Quincey's original patch.

* H5PL (complete) and basic H5VL API documentation.

* Added H5I API docs.

* Added H5L API docs.

* First installment from Elena's H5T batch.

* Second installment of Elena's H5T batch.

* Final installment of Elena's H5T batch.

* Full set of current H5F documentation. (#105)

* First cut of the H5 public API documentation.

* Added H5Z "bonus track."

* Applied Quincey's patch.

* Added the missing patches from Quincey's original patch.

* H5PL (complete) and basic H5VL API documentation.

* Added H5I API docs.

* Added H5L API docs.

* First installment from Elena's H5T batch.

* Second installment of Elena's H5T batch.

* Final installment of Elena's H5T batch.

* Migrated documentation for SWMR functions.

* Catching up on MDC functions.

* Integrated the H5F MDC function documentation.

* Added MDC and parallel H5F functions.

* Slightly updated main page.

* Added doxygen/dox/H5AC_cache_config_t.dox to MANIFEST.

* Doxygen - added (mostly) beginner functions (#112)

* Doxygen - added (mostly) beginner functions

* Removed duplicate H5Pset_szip function

* Add src/H5module.h to MANIFEST.

* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Avoid aligned access for references by decoding into temporary buffer and then copying the result into the actual buffer.   Update test to be more thorough with using compound datatype fields everywhere. (#206)

* Modify temporary rpath for testing in java example scripts. (#230)

* Fix undefined left shifting of negative numbers (#338)

Undefined Bahavior Sanitizer errored here about left shifting negative numbers.

* Fixes various warnings noticed on Windows (#425)

* Fixes various warnings noticed on Windows

- Adds a prototype for our implementation of vasprintf
- Return type of H5_get_utf16_str() is now non-const
- Fixes possible uninitialized return type in Wremove_utf8
- Better isolation of fork() code in accum.c:test_swmr_write_big()
- Better isolation of non-zlib code in dsets.c:test_filter_delete()
- Removed unused variable in trefer.c:test_reference_cmpnd_obj()

* Fixes clang-format issues

* Applied clang-tidy readability-non-const-parameter warning fixes auto… (#429)

* Automatically applied clang-tidy readability-avoid-const-params-in-decls fixes

Removes useless const declarations.

* Fixed most readability-non-const-parameter warnings

These changes were made automatically by clang-tidy, but I manually reverted the changes related to the H5Z_func_t signature.

* Reformat source with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Added C++11 override keyword where appropriate (#433)

Added H5_OVERRIDE macro for compatibility with both C++11 and older.

* Various clang tidy warning fixes (#448)

* Fixed clang-tidy bugprone-reserved-identifier warnings

* Fixed clang-tidy bugprone-assert-side-effect warnings

* Fixed clang-tidy bugprone-copy-constructor-init warning

* Fixed clang-tidy readability-redundant-preprocessor warning

For error_test.c the removed code was already dead, because it was in the else of an `#if H5_USE_16_API` block.

Based on H5Location.h, I think p_get_ref_obj_type was meant to be in `#ifndef DOXYGEN_SHOULD_SKIP_THIS` and an `#endif` was missing.  Similarly, in the header, getObjTypeByIdx is only in H5_NO_DEPRECATED_SYMBOLS, not DOXYGEN_SHOULD_SKIP_THIS.

* Fixed clang-tidy readability-redundant-string-init warnings

* Fixed some clang-tidy performance-type-promotion-in-math-fn warnings

* Fixed clang-tidy performance-unnecessary-value-param warnings

* Reformat source with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Removed checks/workarounds for pre-C++89 compatibility (#449)

After 30+ years, just assume that the following exist:
- extension-less includes
- namespaces
- std::
- static_cast
- bool

* Fixed all clang-tidy bugprone-suspicious-string-compare warnings (#451)

* Fixed all clang-tidy bugprone-suspicious-string-compare warnings

This change was generated entirely by clang-tidy itself.

* Reformat code with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Remove 2 functions incorrectly merged from develop in a cherry-pick merge of PR #451.

* Minor parallel improvements (#519)

* Improve MPI error reporting, handled failed operations in parallel tests more nicely, and clean up MPI_Allreduce for determining whether to break collective I/O

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Clean up MPI-IO VFD tracing support (#520)

* Clean up tracing support

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Brings the native implementation of H5Fdelete() from Bitbucket (#524)

* Committing clang-format changes

* Brings the native VFD H5Fdelete() implementation from Bitbucket

Only brings the 'del' callbacks, not the 'open/close' scheme.

* Formatter changes

* Committing clang-format changes

* Fixes direct VFD callback name

* Removes UNUSED macro from family API call

* Adds barrier and rank 0 check to MPI-I/O VFD delete

* Revert "Adds barrier and rank 0 check to MPI-I/O VFD delete"

This reverts commit 909765f759d9d96e84f4b8b1cc14f7d2b3ac8143.

* Revert "Revert "Adds barrier and rank 0 check to MPI-I/O VFD delete""

This reverts commit 9b04bef1157853fc79fcb8fcc3e8ba1371091702.

* Adds a second barrier after the delete in MPI-I/O VFD

* Only delete files in the core VFD when the backing store flag is set

* Fixes string issues in multi VFD

Also, h5test.c cleanup code now uses H5Fdelete().

* Formatted source

* Rework fapl checks for MPI-I/O VFD delete callback

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Minor warning fixes in develop (#526)

* Committing clang-format changes

* Minor warning fixes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes implementation of my_strdup() from the multi VFD (#527)

* Committing clang-format changes

* Removes my_strdup() from the multi VFD

* Use strdup directly when memory sanity checks are off

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes dead H5ST package from the library (#528)

* Committing clang-format changes

* Removes the unused H5ST package from the library

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix HDFFV-11232 (#530)

* fixed missed closing of a dataset

* fixed missed closing of a dataset

* fixed typo in error return

* Committing clang-format changes

* minor edits

* code format

* Committing clang-format changes

* code format

* minor edit

* added H5fortkit dependency for H5VLff.F90, HDFFV-11232

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fixes incorrect usage of H5I_BADID (#554)

* Committing clang-format changes

* Fixes incorrect use of H5I_BADID

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fixes a segfault when H5Pset_mdc_log_options is called multiple times on a fapl (#601)

* Committing clang-format changes

* Fixes a segfault when H5Pset_mdc_log_options() is called multiple times

An internal string is incorrectly freed when the API call is invoked
multiple times on a property list, which will usually cause a segfault
to occur. On the first call the log location is NULL so the problem
doesn't occur.

Fixes HDFFV-11239

* Fixes typos

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix for a segfault when H5Pset_fapl_log is passed an invalid fapl ID (#607)

* Committing clang-format changes

* Fixes an issue where H5Pset_fapl_log sefaults when passed an invalid
fapl ID

This was due to a pointer-containing struct being memset after the first
internal API call. If the first call failed, the error condition would
check if the pointer was not NULL and then attempt to free it if not.
This would lead to the freeing of a wild pointer if an invalid fapl ID
were passed in.

This was fixed by reordering the memset and adding a test to ensure the
problem stays fixed.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fixes crashes when size_hint > UINT32_MAX is passed to H5Gcreate1 (#611)

* Committing clang-format changes

* Fixes incorrect size_hint handling in H5Gcreate1

* Updates the size hint type for group creation

* Updates the RELEASE.txt note

* Revert "Updates the RELEASE.txt note"

This reverts commit 3df386acca806d652bbe2209f7c4503b30f068ff.

* Reverts previous behavior to use a uint32_t struct field

* Updates RELEASE.txt

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Revert "Brings the native implementation of H5Fdelete() from Bitbucket (#524)"

This reverts commit 38d1b121ae428138b8863c2a319518c7363c2d94.

* Removed mentions of Wdeclaration-after-statement now that C99 is requ… (#447)

* Removed mentions of Wdeclaration-after-statement now that C99 is required

* Remove -Werror=declaration-after-statement from error-general file.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Made private my_yyinput function static (#618)

This prevents it being exported as a public symbol.

* Adds const to a few global variables (#623)

* Committing clang-format changes

* Adds consts to a few global variables

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* (fix) Segmentation fault when using a compound type. (#143)

* (fix) Segmentation fault when using a compound type.

In the case when a compounded attribute is written to dataset
followed by writing the data with a data transform function
to the dataset will result in a segmentation fault. It turns out
the data is classified as compounded while it is not. Now, the
state is always reset first to not compounded followed by the
existing check if the variable is compounded.

* (fix) Removed undesired comment lines.

* (fix) Segmentation fault when using a compound type: added test.

* (fix) Added the missing cmpd_transform.c file to MANIFEST.

* (fix) cmpd_dtransform test: autotools and source header.

Added the cmp_dtransform test to the autotools configuration and
updated the HDF Group copyright header.

Co-authored-by: Jan-Willem Blokland <Jan-Willem.Blokland@Shell.com>

* (fix) H5Z_xform_create function and scientific notation (#144)

* (fix) H5Z_xform_create function and scientific notation

Implemented a more sophisticated check to support scientific notation
in the expression of the H5Zset_data_transform function.

* (fix) H5Z_xform_create and scientific notation: Added test.

Added a test to demonstrate that the parsing of expression
which includes scientific notation works correctly. Improved
inline comment.

Co-authored-by: Jan-Willem Blokland <Jan-Willem.Blokland@Shell.com>

* Committing clang-format changes

* Fix H5Eget_auto2/H5Eauto_is_v2 to not clear error stack (#625)

* Cleanup tools debug build warnings (#627)

* OESS-98 convert plugin option to FetchContent, add tests

* Fixes for pkcfg files because of plugin option

* OESS-98 fix tools test for plugins

* Keep doxygen comments under 100 chars long - format hint

* Whitespace

* HDFFV-11144 - Reclassify CMake messages

* HDFFV-11099/11100 added help text

* Reworked switch statement to compare string instead

* Fix typo

* Update CDash mode

* Correct name of threadsafe

* Correct option name

* Undo accidental commit

* Note LLVM 10 to 11 format default changes

* Update format plugin

* Undo clang-format version 11 changes

* One more correction

* Update supported platforms

* Revert whitespace changes

* Correct whitespace

* Changes from PR#3

* HDFFV-11213 added option to control gcc10 warnings diagnostics

* HDFFV-11212 Use the new references correctly in JNI utility and tests

* format source

* Fix typo

* Add new test file

* HDFFV-11212 - update test and remove unused arg

* Minor non-space formatting changes

* Use H5I_INVALID_ID instead of "-1"

* source formatting

* add missing testfile, update jni function

* Undo commit of debug code

* remove mislocated file

* Fix h5repack test for handling of fapls and id close

* Update h5diff test files usage text

* HDFFV-11212 add new ref tests for JNI export dataset

* src format update

* Remove blank line typo

* src format typo

* long double requires %Lg

* Another long double foramt specifer S.B. %Lg

* issue with t128bit test

* Windows issue with h5dump and type.

* Fix review issues

* refactor function nesting and fix error checks

* format fixes

* Remove untested functions and javadoc quiet comments

* Restore TRY block.

* Change string append errors to memory exception

* revert to H5_JNI_FATAL_ERROR - support functions need work

* Add assertion error for h5util functions

* remove duplicate function

* format fix

* Revert HD function error handling

* Update copyright comments

* GH #386 java folder copyright corrections

* Whitespace

* GH #359 implement and fix tools 1.6 API usage

* remove excessive comments

* Flip inits to correct ifdef section

* rework ifdef to be simpler

* format issue

* Reformat ifdef inits

* remove static attribute

* format compliance

* Update names

* Revert because logic relies on float not being int

* Changes noticed from creating merge of #412

* Double underscore change

* Correct compiler version variable used

* Remove header guard underscores

* Whitespace cleanup

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* correct window os name

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* HDFFV-11113 long double in tools

* HDFFV-11113 add note

* Disable long double tests for now

* HDFFV-11228 remove arbitrary CMake warning groups.

* Make each flag a string

* Some Javadoc warning fixes

* Updated javadoc fixes

* # WARNING: head commit changed in the meantime

HDFFV-11229 Fix long double usage in tools and java

Changed h5dump and h5ls to just print 128-bit for long double type.
Added test and file for dataset and attributes with all three float
types.

* Committing clang-format changes

* HDFFV-11229 Add release note

* HDFFV-11229 windows testfile needed

* fix typo

* Remove non supported message text

* HDFFV-11229 - change ldouble test to check both native and general

* HDFFV-11229 add second file compare

* HDFFV-11229 fix reference file

* HDFFV-11229 autotools check two refs

* HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output

* Committing clang-format changes

* Update release note

* Update attribute type of ref file

* Change source of ninja for macs

* try port instead of brew

* Recommended is to use brew.

* Undo non long double changes

* remove unneeded file

* Fix perl and doxygen CMake code

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

* Add stamp files to BYPRODUCTS

* Only one copy of file exists

* Fix custom cmmand depends targets

* Fix fortran custom command DEPENDS

* Add LD_LIBRARY_PATH to tests

* Add custom target for DEPENDS

* Add h5detect conditionaly to generated target DEPENDS

* Correct DEPENDS targets

* Parallel builds need the mpi compiler for pkgconfig scripts.

* install only if MPI build

* Fortran target depends

* Remove incorrect source attribute

* doxygen adjustments

* doxygen build updates

* Correct version

* Correct function version - function has been merged to 1.12

* Correct version string for map functions

* Cleanup warnings for tools debug builds

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* h5diff subset indexing (#628)

* OESS-98 convert plugin option to FetchContent, add tests

* Fixes for pkcfg files because of plugin option

* OESS-98 fix tools test for plugins

* Keep doxygen comments under 100 chars long - format hint

* Whitespace

* HDFFV-11144 - Reclassify CMake messages

* HDFFV-11099/11100 added help text

* Reworked switch statement to compare string instead

* Fix typo

* Update CDash mode

* Correct name of threadsafe

* Correct option name

* Undo accidental commit

* Note LLVM 10 to 11 format default changes

* Update format plugin

* Undo clang-format version 11 changes

* One more correction

* Update supported platforms

* Revert whitespace changes

* Correct whitespace

* Changes from PR#3

* HDFFV-11213 added option to control gcc10 warnings diagnostics

* HDFFV-11212 Use the new references correctly in JNI utility and tests

* format source

* Fix typo

* Add new test file

* HDFFV-11212 - update test and remove unused arg

* Minor non-space formatting changes

* Use H5I_INVALID_ID instead of "-1"

* source formatting

* add missing testfile, update jni function

* Undo commit of debug code

* remove mislocated file

* Fix h5repack test for handling of fapls and id close

* Update h5diff test files usage text

* HDFFV-11212 add new ref tests for JNI export dataset

* src format update

* Remove blank line typo

* src format typo

* long double requires %Lg

* Another long double foramt specifer S.B. %Lg

* issue with t128bit test

* Windows issue with h5dump and type.

* Fix review issues

* refactor function nesting and fix error checks

* format fixes

* Remove untested functions and javadoc quiet comments

* Restore TRY block.

* Change string append errors to memory exception

* revert to H5_JNI_FATAL_ERROR - support functions need work

* Add assertion error for h5util functions

* remove duplicate function

* format fix

* Revert HD function error handling

* Update copyright comments

* GH #386 java folder copyright corrections

* Whitespace

* GH #359 implement and fix tools 1.6 API usage

* remove excessive comments

* Flip inits to correct ifdef section

* rework ifdef to be simpler

* format issue

* Reformat ifdef inits

* remove static attribute

* format compliance

* Update names

* Revert because logic relies on float not being int

* Changes noticed from creating merge of #412

* Double underscore change

* Correct compiler version variable used

* Remove header guard underscores

* Whitespace cleanup

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* correct window os name

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* HDFFV-11113 long double in tools

* HDFFV-11113 add note

* Disable long double tests for now

* HDFFV-11228 remove arbitrary CMake warning groups.

* Make each flag a string

* Some Javadoc warning fixes

* Updated javadoc fixes

* # WARNING: head commit changed in the meantime

HDFFV-11229 Fix long double usage in tools and java

Changed h5dump and h5ls to just print 128-bit for long double type.
Added test and file for dataset and attributes with all three float
types.

* Committing clang-format changes

* HDFFV-11229 Add release note

* HDFFV-11229 windows testfile needed

* fix typo

* Remove non supported message text

* HDFFV-11229 - change ldouble test to check both native and general

* HDFFV-11229 add second file compare

* HDFFV-11229 fix reference file

* HDFFV-11229 autotools check two refs

* HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output

* Committing clang-format changes

* Update release note

* Update attribute type of ref file

* Change source of ninja for macs

* try port instead of brew

* Recommended is to use brew.

* Undo non long double changes

* remove unneeded file

* Fix perl and doxygen CMake code

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

* Add stamp files to BYPRODUCTS

* Only one copy of file exists

* Fix custom cmmand depends targets

* Fix fortran custom command DEPENDS

* Add LD_LIBRARY_PATH to tests

* Add custom target for DEPENDS

* Add h5detect conditionaly to generated target DEPENDS

* Correct DEPENDS targets

* Parallel builds need the mpi compiler for pkgconfig scripts.

* install only if MPI build

* Fortran target depends

* Remove incorrect source attribute

* doxygen adjustments

* doxygen build updates

* Correct version

* Correct function version - function has been merged to 1.12

* Correct version string for map functions

* Cleanup warnings for tools debug builds

* TRILAB-227 - fix indexing for h5diff selections

* Correct location of pos to index function call

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes gratuitous (double)x.yF casts (#632)

* Committing clang-format changes

* Removes gratuitous (double)x.yF casts

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Cleans up a const warning left over from previous constification (#633)

* Committing clang-format changes

* Adds consts to a few global variables

* Cleans up a const warning left over from previous constification

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Purges UFAIL from the library (#637)

* Committing clang-format changes

* Purges UFAIL from the library

* H5HL_insert change requested in PR

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bmr dev hdffv 11223 (#640)

* Fixed HDFFV-11223 (CVE-2018-14460)

Description
    - Added checks against buffer size to prevent segfault, in case of data
      corruption, for sdim->size and sdim->max.
    - Renamed data files in an existing test to shorten their length
      as agreed with other developers previously.
Platforms tested:
    Linux/64 (jelly)

* Committing clang-format changes

* Updated for test files

* Updated for HDFFV-11223

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Revert "Fix H5Eget_auto2/H5Eauto_is_v2 to not clear error stack (#625)"

This reverts commit 7a682862846fa206aa3a0151c0aa08d7c759b1f7.

Co-authored-by: Gerd Heber <gheber@hdfgroup.org>
Co-authored-by: bljhdf <58825073+bljhdf@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Quincey Koziol <quincey@koziol.cc>
Co-authored-by: Sean McBride <sean@rogue-research.com>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Quincey Koziol <koziol@lbl.gov>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scot Breitenfeld <brtnfld@hdfgroup.org>
Co-authored-by: Jan-Willem Blokland <J.W.S.Blokland@XS4All.nl>
Co-authored-by: Jan-Willem Blokland <Jan-Willem.Blokland@Shell.com>
Co-authored-by: jhendersonHDF <jhenderson@hdfgroup.org>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

1 files changed, 186 insertions, 200 deletions

diff --git a/src/H5VM.c b/src/H5VM.c
index 49cad20..4d65d75 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -43,20 +43,20 @@ static void H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n
 #endif /* LATER */
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM__stride_optimize1
+ * Function:    H5VM__stride_optimize1
  *
- * Purpose:	Given a stride vector which references elements of the
- *		specified size, optimize the dimensionality, the stride
- *		vector, and the element size to minimize the dimensionality
- *		and the number of memory accesses.
+ * Purpose:     Given a stride vector which references elements of the
+ *              specified size, optimize the dimensionality, the stride
+ *              vector, and the element size to minimize the dimensionality
+ *              and the number of memory accesses.
  *
- *		All arguments are passed by reference and their values may be
- *		modified by this function.
+ *              All arguments are passed by reference and their values may be
+ *              modified by this function.
  *
- * Return:	None
+ * Return:      void
  *
- * Programmer:	Robb Matzke
- *		Saturday, October 11, 1997
+ * Programmer:  Robb Matzke
+ *              Saturday, October 11, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -66,15 +66,12 @@ H5VM__stride_optimize1(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, c
 {
     FUNC_ENTER_STATIC_NOERR
 
-    /*
-     * This has to be true because if we optimize the dimensionality down to
+    /* This has to be true because if we optimize the dimensionality down to
      * zero we still must make one reference.
      */
     HDassert(1 == H5VM_vector_reduce_product(0, NULL));
 
-    /*
-     * Combine adjacent memory accesses
-     */
+    /* Combine adjacent memory accesses */
     while (*np && stride1[*np - 1] > 0 && (hsize_t)(stride1[*np - 1]) == *elmt_size) {
         *elmt_size *= size[*np - 1];
         if (--*np)
@@ -85,20 +82,20 @@ H5VM__stride_optimize1(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, c
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM__stride_optimize2
+ * Function:    H5VM__stride_optimize2
  *
- * Purpose:	Given two stride vectors which reference elements of the
- *		specified size, optimize the dimensionality, the stride
- *		vectors, and the element size to minimize the dimensionality
- *		and the number of memory accesses.
+ * Purpose:     Given two stride vectors which reference elements of the
+ *              specified size, optimize the dimensionality, the stride
+ *              vectors, and the element size to minimize the dimensionality
+ *              and the number of memory accesses.
  *
- *		All arguments are passed by reference and their values may be
- *		modified by this function.
+ *              All arguments are passed by reference and their values may be
+ *              modified by this function.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Saturday, October 11, 1997
+ * Programmer:  Robb Matzke
+ *              Saturday, October 11, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -108,16 +105,13 @@ H5VM__stride_optimize2(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, c
 {
     FUNC_ENTER_STATIC_NOERR
 
-    /*
-     * This has to be true because if we optimize the dimensionality down to
+    /* This has to be true because if we optimize the dimensionality down to
      * zero we still must make one reference.
      */
     HDassert(1 == H5VM_vector_reduce_product(0, NULL));
     HDassert(*elmt_size > 0);
 
-    /*
-     * Combine adjacent memory accesses
-     */
+    /* Combine adjacent memory accesses */
 
     /* Unroll loop for common cases */
     switch (*np) {
@@ -206,29 +200,26 @@ H5VM__stride_optimize2(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/, c
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM_hyper_stride
- *
- * Purpose:	Given a description of a hyperslab, this function returns
- *		(through STRIDE[]) the byte strides appropriate for accessing
- *		all bytes of the hyperslab and the byte offset where the
- *		striding will begin.  The SIZE can be passed to the various
- *		stride functions.
+ * Function:    H5VM_hyper_stride
  *
- *		The dimensionality of the whole array, the hyperslab, and the
- *		returned stride array is N.  The whole array dimensions are
- *		TOTAL_SIZE and the hyperslab is at offset OFFSET and has
- *		dimensions SIZE.
+ * Purpose:     Given a description of a hyperslab, this function returns
+ *              (through STRIDE[]) the byte strides appropriate for accessing
+ *              all bytes of the hyperslab and the byte offset where the
+ *              striding will begin.  The SIZE can be passed to the various
+ *              stride functions.
  *
- *		The stride and starting point returned will cause the
- *		hyperslab elements to be referenced in C order.
+ *              The dimensionality of the whole array, the hyperslab, and the
+ *              returned stride array is N.  The whole array dimensions are
+ *              TOTAL_SIZE and the hyperslab is at offset OFFSET and has
+ *              dimensions SIZE.
  *
- * Return:	Success:	Byte offset from beginning of array to start
- *				of striding.
+ *              The stride and starting point returned will cause the
+ *              hyperslab elements to be referenced in C order.
  *
- *		Failure:	abort() -- should never fail
+ * Return:      Byte offset from beginning of array to start of striding.
  *
- * Programmer:	Robb Matzke
- *		Saturday, October 11, 1997
+ * Programmer:  Robb Matzke
+ *              Saturday, October 11, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -308,23 +299,22 @@ H5VM_hyper_stride(unsigned n, const hsize_t *size, const hsize_t *total_size, co
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM_hyper_eq
+ * Function:    H5VM_hyper_eq
  *
- * Purpose:	Determines whether two hyperslabs are equal.  This function
- *		assumes that both hyperslabs are relative to the same array,
- *		for if not, they could not possibly be equal.
+ * Purpose:     Determines whether two hyperslabs are equal.  This function
+ *              assumes that both hyperslabs are relative to the same array,
+ *              for if not, they could not possibly be equal.
  *
- * Return:	Success:	TRUE if the hyperslabs are equal (that is,
- *				both refer to exactly the same elements of an
- *				array)
+ * Return:      TRUE if the hyperslabs are equal (that is,
+ *              both refer to exactly the same elements of an
+ *              array)
  *
- *				FALSE otherwise.
+ *              FALSE otherwise
  *
- *		Failure:	TRUE the rank is zero or if both hyperslabs
- *				are of zero size.
+ *              Never returns FAIL
  *
- * Programmer:	Robb Matzke
- *		Friday, October 17, 1997
+ * Programmer:  Robb Matzke
+ *              Friday, October 17, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -360,19 +350,19 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5VM_hyper_fill
  *
- * Purpose:	Similar to memset() except it operates on hyperslabs...
+ * Purpose:     Similar to memset() except it operates on hyperslabs...
  *
- *		Fills a hyperslab of array BUF with some value VAL.  BUF
- *		is treated like a C-order array with N dimensions where the
- *		size of each dimension is TOTAL_SIZE[].	 The hyperslab which
- *		will be filled with VAL begins at byte offset OFFSET[] from
- *		the minimum corner of BUF and continues for SIZE[] bytes in
- *		each dimension.
+ *              Fills a hyperslab of array BUF with some value VAL.  BUF
+ *              is treated like a C-order array with N dimensions where the
+ *              size of each dimension is TOTAL_SIZE[].	 The hyperslab which
+ *              will be filled with VAL begins at byte offset OFFSET[] from
+ *              the minimum corner of BUF and continues for SIZE[] bytes in
+ *              each dimension.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Friday, October 10, 1997
+ * Programmer:  Robb Matzke
+ *              Friday, October 10, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -418,31 +408,31 @@ H5VM_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size, con
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM_hyper_copy
+ * Function:    H5VM_hyper_copy
  *
- * Purpose:	Copies a hyperslab from the source to the destination.
+ * Purpose:     Copies a hyperslab from the source to the destination.
  *
- *		A hyperslab is a logically contiguous region of
- *		multi-dimensional size SIZE of an array whose dimensionality
- *		is N and whose total size is DST_TOTAL_SIZE or SRC_TOTAL_SIZE.
- *		The minimum corner of the hyperslab begins at a
- *		multi-dimensional offset from the minimum corner of the DST
- *		(destination) or SRC (source) array.  The sizes and offsets
- *		are assumed to be in C order, that is, the first size/offset
- *		varies the slowest while the last varies the fastest in the
- *		mapping from N-dimensional space to linear space.  This
- *		function assumes that the array elements are single bytes (if
- *		your array has multi-byte elements then add an additional
- *		dimension whose size is that of your element).
+ *              A hyperslab is a logically contiguous region of
+ *              multi-dimensional size SIZE of an array whose dimensionality
+ *              is N and whose total size is DST_TOTAL_SIZE or SRC_TOTAL_SIZE.
+ *              The minimum corner of the hyperslab begins at a
+ *              multi-dimensional offset from the minimum corner of the DST
+ *              (destination) or SRC (source) array.  The sizes and offsets
+ *              are assumed to be in C order, that is, the first size/offset
+ *              varies the slowest while the last varies the fastest in the
+ *              mapping from N-dimensional space to linear space.  This
+ *              function assumes that the array elements are single bytes (if
+ *              your array has multi-byte elements then add an additional
+ *              dimension whose size is that of your element).
  *
- *		The SRC and DST array may be the same array, but the results
- *		are undefined if the source hyperslab overlaps the
- *		destination hyperslab.
+ *              The SRC and DST array may be the same array, but the results
+ *              are undefined if the source hyperslab overlaps the
+ *              destination hyperslab.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Friday, October 10, 1997
+ * Programmer:  Robb Matzke
+ *              Friday, October 10, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -592,13 +582,13 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size, const hsize_t *dst_size, const
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_fill
  *
- * Purpose:	Fills all bytes of a hyperslab with the same value using
- *		memset().
+ * Purpose:     Fills all bytes of a hyperslab with the same value using
+ *              memset().
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Saturday, October 11, 1997
+ * Programmer:  Robb Matzke
+ *              Saturday, October 11, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -643,19 +633,19 @@ H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_copy
  *
- * Purpose:	Uses DST_STRIDE and SRC_STRIDE to advance through the arrays
- *		DST and SRC while copying bytes from SRC to DST.  This
- *		function minimizes the number of calls to memcpy() by
- *		combining various strides, but it will never touch memory
- *		outside the hyperslab defined by the strides.
+ * Purpose:     Uses DST_STRIDE and SRC_STRIDE to advance through the arrays
+ *              DST and SRC while copying bytes from SRC to DST.  This
+ *              function minimizes the number of calls to memcpy() by
+ *              combining various strides, but it will never touch memory
+ *              outside the hyperslab defined by the strides.
  *
- * Note:	If the src_stride is all zero and elmt_size is one, then it's
- *		probably more efficient to use H5VM_stride_fill() instead.
+ * Note:        If the src_stride is all zero and elmt_size is one, then it's
+ *              probably more efficient to use H5VM_stride_fill() instead.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Saturday, October 11, 1997
+ * Programmer:  Robb Matzke
+ *              Saturday, October 11, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -709,19 +699,19 @@ H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize
 /*-------------------------------------------------------------------------
  * Function:	H5VM_stride_copy_s
  *
- * Purpose:	Uses DST_STRIDE and SRC_STRIDE to advance through the arrays
- *		DST and SRC while copying bytes from SRC to DST.  This
- *		function minimizes the number of calls to memcpy() by
- *		combining various strides, but it will never touch memory
- *		outside the hyperslab defined by the strides.
+ * Purpose:     Uses DST_STRIDE and SRC_STRIDE to advance through the arrays
+ *              DST and SRC while copying bytes from SRC to DST.  This
+ *              function minimizes the number of calls to memcpy() by
+ *              combining various strides, but it will never touch memory
+ *              outside the hyperslab defined by the strides.
  *
- * Note:	If the src_stride is all zero and elmt_size is one, then it's
- *		probably more efficient to use H5VM_stride_fill() instead.
+ * Note:        If the src_stride is all zero and elmt_size is one, then it's
+ *              probably more efficient to use H5VM_stride_fill() instead.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Saturday, October 11, 1997
+ * Programmer:  Robb Matzke
+ *              Saturday, October 11, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -775,17 +765,17 @@ H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size, const hss
 #ifdef LATER
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM__stride_copy2
+ * Function:    H5VM__stride_copy2
  *
- * Purpose:	Similar to H5VM_stride_copy() except the source and
- *		destination each have their own dimensionality and size and
- *		we copy exactly NELMTS elements each of size ELMT_SIZE.	 The
- *		size counters wrap if NELMTS is more than a size counter.
+ * Purpose:     Similar to H5VM_stride_copy() except the source and
+ *              destination each have their own dimensionality and size and
+ *              we copy exactly NELMTS elements each of size ELMT_SIZE.	 The
+ *              size counters wrap if NELMTS is more than a size counter.
  *
- * Return:	None
+ * Return:      void
  *
- * Programmer:	Robb Matzke
- *		Saturday, October 11, 1997
+ * Programmer:  Robb Matzke
+ *              Saturday, October 11, 1997
  *
  *-------------------------------------------------------------------------
  */
@@ -843,16 +833,16 @@ H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n, const hsiz
 #endif /* LATER */
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM_array_fill
+ * Function:    H5VM_array_fill
  *
- * Purpose:	Fills all bytes of an array with the same value using
- *		memset(). Increases amount copied by power of two until the
- *		halfway point is crossed, then copies the rest in one swoop.
+ * Purpose:     Fills all bytes of an array with the same value using
+ *              memset(). Increases amount copied by power of two until the
+ *              halfway point is crossed, then copies the rest in one swoop.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		Thursday, June 18, 1998
+ * Programmer:  Quincey Koziol
+ *              Thursday, June 18, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -895,25 +885,25 @@ H5VM_array_fill(void *_dst, const void *src, size_t size, size_t count)
 } /* H5VM_array_fill() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM_array_down
+ * Function:    H5VM_array_down
  *
- * Purpose:	Given a set of dimension sizes, calculate the size of each
+ * Purpose:     Given a set of dimension sizes, calculate the size of each
  *              "down" slice.  This is the size of the dimensions for all the
  *              dimensions below the current one, which is used for indexing
  *              offsets in this dimension.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:	    void
  *
- * Programmer:	Quincey Koziol
- *		Monday, April 28, 2003
+ * Programmer:  Quincey Koziol
+ *              Monday, April 28, 2003
  *
  *-------------------------------------------------------------------------
  */
-herr_t
+void
 H5VM_array_down(unsigned n, const hsize_t *total_size, hsize_t *down)
 {
-    hsize_t acc; /*accumulator			*/
-    int     i;   /*counter			*/
+    hsize_t acc; /* Accumulator */
+    int     i;   /* Counter */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -921,31 +911,31 @@ H5VM_array_down(unsigned n, const hsize_t *total_size, hsize_t *down)
     HDassert(total_size);
     HDassert(down);
 
-    /* Build the sizes of each dimension in the array */
-    /* (From fastest to slowest) */
+    /* Build the sizes of each dimension in the array
+     * (From fastest to slowest)
+     */
     for (i = (int)(n - 1), acc = 1; i >= 0; i--) {
         down[i] = acc;
         acc *= total_size[i];
-    } /* end for */
+    }
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
+    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VM_array_down() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_offset_pre
  *
- * Purpose:	Given a coordinate description of a location in an array, this
- *      function returns the byte offset of the coordinate.
+ * Purpose:     Given a coordinate description of a location in an array, this
+ *              function returns the byte offset of the coordinate.
  *
- *		The dimensionality of the whole array, and the offset is N.
+ *		        The dimensionality of the whole array, and the offset is N.
  *              The whole array dimensions are TOTAL_SIZE and the coordinate
  *              is at offset OFFSET.
  *
- * Return:	Success: Byte offset from beginning of array to element offset
- *		Failure: abort() -- should never fail
+ * Return:      Byte offset from beginning of array to element offset
  *
  * Programmer:	Quincey Koziol
- *		Tuesday, June 22, 1999
+ *		        Tuesday, June 22, 1999
  *
  *-------------------------------------------------------------------------
  */
@@ -971,18 +961,17 @@ H5VM_array_offset_pre(unsigned n, const hsize_t *acc, const hsize_t *offset)
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_offset
  *
- * Purpose:	Given a coordinate description of a location in an array, this
- *      function returns the byte offset of the coordinate.
+ * Purpose:     Given a coordinate description of a location in an array,
+ *              this function returns the byte offset of the coordinate.
  *
- *		The dimensionality of the whole array, and the offset is N.
+ *              The dimensionality of the whole array, and the offset is N.
  *              The whole array dimensions are TOTAL_SIZE and the coordinate
  *              is at offset OFFSET.
  *
- * Return:	Success: Byte offset from beginning of array to element offset
- *		Failure: abort() -- should never fail
+ * Return:      Byte offset from beginning of array to element offset
  *
  * Programmer:	Quincey Koziol
- *		Tuesday, June 22, 1999
+ *              Tuesday, June 22, 1999
  *
  *-------------------------------------------------------------------------
  */
@@ -992,38 +981,36 @@ H5VM_array_offset(unsigned n, const hsize_t *total_size, const hsize_t *offset)
     hsize_t acc_arr[H5VM_HYPER_NDIMS]; /* Accumulated size of down dimensions */
     hsize_t ret_value;                 /* Return value */
 
-    FUNC_ENTER_NOAPI((HDabort(), 0)) /*lint !e527 Don't worry about unreachable statement */
+    FUNC_ENTER_NOAPI_NOERR
 
     HDassert(n <= H5VM_HYPER_NDIMS);
     HDassert(total_size);
     HDassert(offset);
 
     /* Build the sizes of each dimension in the array */
-    if (H5VM_array_down(n, total_size, acc_arr) < 0)
-        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, UFAIL, "can't compute down sizes")
+    H5VM_array_down(n, total_size, acc_arr);
 
     /* Set return value */
     ret_value = H5VM_array_offset_pre(n, acc_arr, offset);
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VM_array_offset() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_calc_pre
  *
- * Purpose:	Given a linear offset in an array, the dimensions of that
+ * Purpose:     Given a linear offset in an array, the dimensions of that
  *              array and the pre-computed 'down' (accumulator) sizes, this
  *              function computes the coordinates of that offset in the array.
  *
- *		The dimensionality of the whole array, and the coordinates is N.
+ *              The dimensionality of the whole array, and the coordinates is N.
  *              The array dimensions are TOTAL_SIZE and the coordinates
  *              are returned in COORD.  The linear offset is in OFFSET.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		Thursday, July 16, 2009
+ * Programmer:  Quincey Koziol
+ *              Thursday, July 16, 2009
  *
  *-------------------------------------------------------------------------
  */
@@ -1050,18 +1037,18 @@ H5VM_array_calc_pre(hsize_t offset, unsigned n, const hsize_t *down, hsize_t *co
 /*-------------------------------------------------------------------------
  * Function:	H5VM_array_calc
  *
- * Purpose:	Given a linear offset in an array and the dimensions of that
+ * Purpose:     Given a linear offset in an array and the dimensions of that
  *              array, this function computes the coordinates of that offset
  *              in the array.
  *
- *		The dimensionality of the whole array, and the coordinates is N.
+ *              The dimensionality of the whole array, and the coordinates is N.
  *              The array dimensions are TOTAL_SIZE and the coordinates
  *              are returned in COORD.  The linear offset is in OFFSET.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		Wednesday, April 16, 2003
+ * Programmer:  Quincey Koziol
+ *              Wednesday, April 16, 2003
  *
  *-------------------------------------------------------------------------
  */
@@ -1079,8 +1066,7 @@ H5VM_array_calc(hsize_t offset, unsigned n, const hsize_t *total_size, hsize_t *
     HDassert(coords);
 
     /* Build the sizes of each dimension in the array */
-    if (H5VM_array_down(n, total_size, idx) < 0)
-        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "can't compute down sizes")
+    H5VM_array_down(n, total_size, idx);
 
     /* Compute the coordinates from the offset */
     if (H5VM_array_calc_pre(offset, n, idx, coords) < 0)
@@ -1093,7 +1079,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5VM_chunk_index
  *
- * Purpose:	Given a coordinate offset (COORD), the size of each chunk
+ * Purpose:     Given a coordinate offset (COORD), the size of each chunk
  *              (CHUNK), the number of chunks in each dimension (NCHUNKS)
  *              and the number of dimensions of all of these (NDIMS), calculate
  *              a "chunk index" for the chunk that the coordinate offset is
@@ -1123,10 +1109,10 @@ done:
  *              The chunk index is placed in the CHUNK_IDX location for return
  *              from this function
  *
- * Return:	Chunk index on success (can't fail)
+ * Return:      Chunk index on success (can't fail)
  *
- * Programmer:	Quincey Koziol
- *		Monday, April 21, 2003
+ * Programmer:  Quincey Koziol
+ *              Monday, April 21, 2003
  *
  *-------------------------------------------------------------------------
  */
@@ -1151,14 +1137,14 @@ H5VM_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk, co
 } /* end H5VM_chunk_index() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5VM_chunk_scaled
+ * Function:    H5VM_chunk_scaled
  *
- * Purpose:	Compute the scaled coordinates for a chunk offset
+ * Purpose:     Compute the scaled coordinates for a chunk offset
  *
- * Return:	<none>
+ * Return:      void
  *
- * Programmer:	Quincey Koziol
- *		Wednesday, November 19, 2014
+ * Programmer:  Quincey Koziol
+ *              Wednesday, November 19, 2014
  *
  *-------------------------------------------------------------------------
  */
@@ -1186,7 +1172,7 @@ H5VM_chunk_scaled(unsigned ndims, const hsize_t *coord, const uint32_t *chunk, h
 /*-------------------------------------------------------------------------
  * Function:	H5VM_chunk_index_scaled
  *
- * Purpose:	Given a coordinate offset (COORD), the size of each chunk
+ * Purpose:     Given a coordinate offset (COORD), the size of each chunk
  *              (CHUNK), the number of chunks in each dimension (NCHUNKS)
  *              and the number of dimensions of all of these (NDIMS), calculate
  *              a "chunk index" for the chunk that the coordinate offset is
@@ -1216,13 +1202,13 @@ H5VM_chunk_scaled(unsigned ndims, const hsize_t *coord, const uint32_t *chunk, h
  *              The chunk index is placed in the CHUNK_IDX location for return
  *              from this function
  *
- * Note:	This routine is identical to H5VM_chunk_index(), except for
- *		caching the scaled information.  Make changes in both places.
+ * Note:        This routine is identical to H5VM_chunk_index(), except for
+ *              caching the scaled information.  Make changes in both places.
  *
- * Return:	Chunk index on success (can't fail)
+ * Return:      Chunk index on success (can't fail)
  *
- * Programmer:	Vailin Choi
- *		Monday, February 9, 2015
+ * Programmer:  Vailin Choi
+ *              Monday, February 9, 2015
  *
  *-------------------------------------------------------------------------
  */
@@ -1257,22 +1243,22 @@ H5VM_chunk_index_scaled(unsigned ndims, const hsize_t *coord, const uint32_t *ch
 /*-------------------------------------------------------------------------
  * Function:	H5VM_opvv
  *
- * Purpose:	Perform an operation on a source & destination sequences
- *		of offset/length pairs.  Each set of sequnces has an array
- *		of lengths, an array of offsets, the maximum number of
- *		sequences and the current sequence to start at in the sequence.
+ * Purpose:     Perform an operation on a source & destination sequences
+ *              of offset/length pairs.  Each set of sequnces has an array
+ *              of lengths, an array of offsets, the maximum number of
+ *              sequences and the current sequence to start at in the sequence.
  *
  *              There may be different numbers of bytes in the source and
  *              destination sequences, the operation stops when either the
  *              source or destination sequence runs out of information.
  *
- * Note:	The algorithm in this routine is [basically] the same as for
- *		H5VM_memcpyvv().  Changes should be made to both!
+ * Note:        The algorithm in this routine is [basically] the same as for
+ *              H5VM_memcpyvv().  Changes should be made to both!
  *
- * Return:	Non-negative # of bytes operated on, on success/Negative on failure
+ * Return:      Non-negative # of bytes operated on, on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		Thursday, September 30, 2010
+ * Programmer:  Quincey Koziol
+ *              Thursday, September 30, 2010
  *
  *-------------------------------------------------------------------------
  */
@@ -1460,7 +1446,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5VM_memcpyvv
  *
- * Purpose:	Given source and destination buffers in memory (SRC & DST)
+ * Purpose:     Given source and destination buffers in memory (SRC & DST)
  *              copy sequences of from the source buffer into the destination
  *              buffer.  Each set of sequences has an array of lengths, an
  *              array of offsets, the maximum number of sequences and the
@@ -1470,13 +1456,13 @@ done:
  *              destination sequences, data copying stops when either the
  *              source or destination buffer runs out of sequence information.
  *
- * Note:	The algorithm in this routine is [basically] the same as for
- *		H5VM_opvv().  Changes should be made to both!
+ * Note:        The algorithm in this routine is [basically] the same as for
+ *              H5VM_opvv().  Changes should be made to both!
  *
- * Return:	Non-negative # of bytes copied on success/Negative on failure
+ * Return:      Non-negative # of bytes copied on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		Friday, May 2, 2003
+ * Programmer:  Quincey Koziol
+ *              Friday, May 2, 2003
  *
  *-------------------------------------------------------------------------
  */