1.8/master (#317)hdf5-1_8_22

* Revert incorrect bool type

* Correct grep text for filter test

* Check sizeof type to use correct ref_type

* h5dump reg ref chnages has no error file

* Fix comment

* Remove unneeded files

* Verify the decoded version for "all" and "none" selection.

* Remove double entry

* Add missing include

* Snapshot version 1.8 release 22 (snap4)
Update version to 1.8-snap5

* Fixes for test failures with --disable-tests --disable-tools options.
Don't test ph5diff if tests are disabled.

* Correct conditions for parallel builds with and without tests.

* Snapshot version 1.8 release 22 (snap5)
Update version to 1.8.22-snap6

* TRILAB-192 merging warnings changes from develop

* Autotools reconfigure update

* Restore page ejects.

* Restore page eject chars

* Fix orphaned token

* Update LT files

* Correct extra flags and merge TRILAB-24

* Update release note for CMake warnings

* H5repack bug fixes from develop

* TRILAB-192 - merge changes from develop

Single source, config files, for warnings for both autotools and CMake.
Update CMake libraries, tools, tests to use correct flags.

* Add missing m4 file

* Remove 128bit config check fo 1.8

* TRILAB-192 update LTparse files

* A fix in the cleaning up code for datatype when datatype initialization via H5D__init_type() fails.
The code to fix the problem is the same as what is done in H5D__open_oid().

* Add missing " and update function calls incorrectly
named load_gcc_arguments.
Commit changes to gnu-cxxflags to remove unmatched " and to gnu-fflags
to not add C warnings flags to H5_FCFLAGS.

* TRILAB-192 - cleanup edits and match CMake CXX to autotools

* Fix shadowed type

* TRILAB-192 correct fortran commands

* TRILAB-192 version of std=f2008 special check

* Fix shadow variable

* Add prefix_relto_examplesdir function to set relative path to h5c++.

* TRILAB-192 - parser files cannot handle this warning

* Parallel Fortran tests now use the MPI module instead of including
mpif.h.

* Don't add general warnings flags for unsupported old versions of gcc and
g++ (older than gcc/g++ 4.2).
Correct gnu-cxxflags to determine warnings flags to be added based on
C++ compiler version instead of C compiler version.

* Snapshot version 1.8 release 22 (snap6)
Update version to 1.8.22-snap7

* TRILAB-244 separate CXX warnings and errors from C

* Fix NoFilter build

* Move ADD_H5_FLAGS macro from *CompilerFlags.cmake files to
config/cmake_ext_mod/HDFMacros.cmake for common use.

* Restrict errors to gcc 4.8 and above.

* OESS-65 replace szip with aec szip

* Correct CMake version

* Correct -Werror=unused-variable

* Add -Werror= flags to lists displayed in libhdf5.settings.

* Fix -Werror=unused-variable

* More fixes for unused variable

* Resolve warning errors from -Werror= flags:
  -Werror=bad-function-cast
  -Werror=bad-function-cast
  -Werror=implicit-function-declaration
  -Werror=nested-externs

* Remove verbose assignments in smoke_check 3 and 5 functions.

* Update to use optimization flags, C++ error flags, and correct
libhdf5.settings.in to remove unworkable changes.

* Update config/gnu-cxxflags.

* Add missing headers

* Fix ifort warning flag.
Restore AC_DEFUN([PAC_PROG_FC_DEFAULT_REALisDBLE] in m4/aclocal_fc.m4.
Add --enable-symbols, --enable-profiling, and --enable-optimization
options to autotools configure;  all configure flags for
--enable-production and --disable-production should match HDF5 1.10 and
1.12 production and debug default flags.

* Add github actions file

* Correct path

* OESS-65 Fix packaging

* Update reference name

* Correct filename

* disable pr action and enable fail fast

* Snapshot 1.8.22-snap7
Update version to 1.8.22-snap8.

* Correct mingw path

* Correct mingw paths

* Revise gnu-*flags and cmake/HDF*CompilerFlags.cmake files to add warning
flags for GCC compilers version 4.8 and above.
Removed files from gnu-warnings that only apply to versions < 4.8.
Consolidated warnings from versions < 4.8 that apply to versions >= 4.8
into the 4.8 warnings files.

* Update MANIFEST for removal of older warnings files.

* Yanked all MPI-1 calls
Added batch scripts in bin/batch.

* Snapshot 1.8.22-snap8.
Update version to 1.8.22-snap9.

* Squashed commit of the following:

commit 45b0cbc71929930a874e1c09e0770aa64d0ae697
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Thu Apr 23 13:14:56 2020 -0500

    Add C++ warnings treated as error for autotools builds.

commit 6debcddcc766601799d5bd661bd60946f951a07e
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Fri Jun 19 16:50:03 2020 -0500

    Remove tests for develop branch from testh5cc.sh.in.
    Add @H5_ECXXFLAGS@ to AM_CXXFLAGS.

commit fed497e7f207313b2a133d3b68c942b7d7104b90
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Fri Jun 12 15:06:39 2020 -0500

    Merge pull request #2646 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit '998c6470d78e14228695419c3b514c35ecf3d69e':
      Remove unnecessary version conditions for Clang compilers.

commit 92e52ce5c211bd1d3991a3b8bb67287ac7b652aa
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Wed Jun 10 18:53:45 2020 -0500

    Merge pull request #2639 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit 'a33667faf226f5d8c9633bf537893e8fce1bf1f6':
      Add c++ to --enable-sanitize-checks option.

commit 2e802534fb997b81fa98fdd1c7d97d4310898e0d
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Wed Jun 10 15:18:36 2020 -0500

    Merge pull request #2633 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit '20eab963899841c9a003baebead8e3bc07d9e127':
      Remove duplicate entries in MANIFEST.
      Make changes to CMake CompilerFlags.cmake files so extra flags are loaded for non-GNU compilers.
      Update new clang files to not pick up clang as vendor for pgCC. Add new files to MANIFEST Temporary demotion of 2 -Werror warning flags that fail on macos 10.12 Remove Production flag unknown to Apple clang.

commit 96ef60a58a23847a7da89a891f2415055ec2ab60
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Mon Jun 8 16:24:49 2020 -0500

    Merge pull request #2631 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit 'b942a4d8a3e27317cac50ce37ff5302d477664d8':
      Clean up code to get clang version in config/linux-gnulibc1

commit 8a7c687da568e8b50b38fa53da1ca63759be6ec4
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Mon Jun 8 11:42:37 2020 -0500

    Merge pull request #2623 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit 'c7626f79fdee4eee13925e240ef41e61f3367eab':
      Add flags from config/clang-warnings/*general files to H5 C and CXX flags for all versions of Clang and Clang++ compilers. Switched from cut to awk in testcheck_version.sh.in to avoid dependence on tab vs. " " in version definitions in H5public.h.
      Add files for adding warning flags for clang compilers in autotools configure.

commit db3ef7ff3c1ed79167cecef831501411cff8291f
Merge: 5a0f8d7 f9f1310
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Fri Jun 19 14:46:22 2020 -0500

    Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_12

commit 5a0f8d7940ae57b445f545a0abd7e303ce6924ee
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Wed Jun 10 20:15:41 2020 -0500

    Merge pull request #2636 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:HDFFV-11000-update-testh5cc.sh.in-for-version to develop

    * commit '5c0bd670d6e9919c463fbc05de99e2ba55b0761e':
      Add tests for all version to H5_NO_DEPRECATED_SYMBOLS section and to section for current version, with and without default API version flags.
      HDFFV-11000:  update-testh5cc.sh.in to test sample versioned functions in HDF5 1.10, 1.12 and develop.

* Update configure and Makefile.ins after bin/reconfigure.

* Fix MANIFEST

* Fix HDFFV-10591

Description:
    h52gif produced a segfault when a buffer overflow occurred because
    the data size was corrupted and became very large.  This commit added
    a check on the data size against the buffer size to prevent the segfault.
    It also added error reporting to h52gif to display an error message
    instead of silently exiting when the failure occurred.
Platforms tested:
    Linux/64 (jelly)

* Snapshot 1.8.22-snap9. Update version to 1.8.22-snap10.

* Merge pull request #2686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

* commit '800f93f7c994f88dfa716746153ded4b1e690e3a':
  Remove path to szip header file from AM_CPPFLAGS when configure check of libsz fails. Fix for HDFFV-10830.

* Regenerate configure.

* Merge from 1.10-1.12-dev - LT parse needs update

* Incorporate pull request #2693 from develop for the fix to HDFFV-11080:
(1) Patch up the file pointer when reading attribute of variable length datatype
(2) Test to verify the fix when doing multiple threads
(3) Update MANIFEST
(4) Add new test to Cmake

* Switch bison and flex update of LT files from bin/genltanalyse to
bin/genparser, and from automatically updating the LT files whenever
reconfigure is run to running only on man<F12>ual command.

* Update hl/sr/H5LT files.
Add bin/genparser to MANIFEST; remove bin/genltanalyze.

* Fix to the merge of PR #2708 for HDFFV-11080 to the 1.8 branch.
Need to checkin test/Makefile.in for the new file added.

* Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)

Description:
    When a buffer overflow occurred because a name length was corrupted
    and became very large, h5dump produced a segfault on one file and a
    memcpy parameter overlap on another file.  This commit added checks
    that detect a read pass the end of the buffer to prevent these error
    conditions.
Platforms tested:
    Linux/64 (jelly)

* Fixed typo

* Check for header szlib.h only when libsz passes AC_CHECK_LIB, so that
H5_HAVE_SALIB_H is not defined when szip is not enabled, to prevent
compile failures for incompatible szlib.

* HDFFV-11127 - force RTLD_LOCAL in dlopen

* spelling

* Remove extra parens

* Remove unnecessary assignment freom configure.ac.

* Add hypen to subrelease regex

* Add special case when H5_VERS_SUBRELEASE is 0

* Revert H5_VERS_SUBRELEASE check

* The version string has a second use for packaging

* MinGW uses "MinGW Makefiles"

* Snapshot 1.8.22-snap10. Update version to 1.8.22-snap11.

* Merge clang-format changes from develop

* remove stray file

* Source formatted

* Add options to github actions.

* Add back file, remove py file

* HDFFV-11096 Correct h5dump usage text

* Update formating

* remove autogen for 1.8 branch

* Fix comment whitespace

* Change '==' to 'eq' in test script

* Merge from develop

github updates
bin scripts
parser updates

* Snapshot 1.8.22-snap11. Update version to 1.8.22-snap12.

* Merge from 1.10

Comments, whitespace
Simple init and if block brackets.
Minimal code changes limited to return value and spelling

* Update autotools files

* Update FD source

* More merges from 1.10 comments and inits

* Comment fixes

* Fix macro argument

* Remove autogen file and cache dir

* Revert autotools files to previous version

* Correct boolean value and missing define

* URL and options corrections

* revert autoconf files

* Fix compile issues with vfd drivers.

* Fix HDFS test

* Remove extra #endif

* Move init above execution

* Multiple changes to bring branch up-to-date (#87)

Correct TARGET variable and CMake config file location.
Add option to allow filter plugins to be built inline.
Update CMake tools macros.

* hdf5 1 8 release text (#113)

* Multiple changes to bring branch up-to-date

Correct TARGET variable and CMake config file location.
Add option to allow filter plugins to be built inline.
Update CMake tools macros.

* release text updates - mostly whitespace

* Fixed HDFFV-10480 and HDFFV-11159 (#145)

* Fixed HDFFV-10480 and HDFFV-11159

Description
    Checked against buffer size to prevent segfault, in case of data corruption.

    + HDFFV-11159 CVE-2018-14033 Buffer over-read in H5O_layout_decode
    + HDFFV-10480 CVE-2018-11206 Buffer over-read in H5O_fill_new[/old]_decode and
        A user's patch was applied to this previously, but it is redone
        for a more correct fix, that is the check now accounted for the
        previous advance of the buffer pointer.

Platforms tested:
    Linux/64 (jelly)

* Fixed typo

* Update HDF5 1.8 copyright headers with updated copyright URL (#148)

* Update URL for COPYING file in copyright headers.

* Make fortran copyright headers uniformly spaced.

* Update url for Copyright file in c++/src/footer.html.

* OESS-98 Update plugin build option (#171)

* 1.8 has extra fortran CMake option (#176)

* 1.8 has extra fortran CMake option

* Update license URL

* OESS-98 fix tools test for plugins (#180)

* Hdf5 1 8 (#169)

* Fixed HDFFV-10480 and HDFFV-11159

Description
    Checked against buffer size to prevent segfault, in case of data corruption.

    + HDFFV-11159 CVE-2018-14033 Buffer over-read in H5O_layout_decode
    + HDFFV-10480 CVE-2018-11206 Buffer over-read in H5O_fill_new[/old]_decode and
        A user's patch was applied to this previously, but it is redone
        for a more correct fix, that is the check now accounted for the
        previous advance of the buffer pointer.

Platforms tested:
    Linux/64 (jelly)

* Fixed typo

* Fixed HDFFV-11150

Description
    Replaced an HDassert with a check for null pointer in H5O_dec_rc() to
    catch null pointer in corrupted data situation.
    Reversed the fix in svn-r24463 in which a check for null pointer prior
    to calling H5O_dec_rc()
Platforms tested:
    Linux/64 (jelly)

* HDF5 1 8 fix fortran build on macs (#186)

* Correct fortran and shared libs option

* Fix for no shared fortran build

* OESS-98 fix hdf5 link target (#191)

* Partial changes to RELEASE.txt for release. (#185)

* Partial changes to RELEASE.txt for release.

* Update supported and tested platforms.

* Update version to 1.8.22-12.

* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Update directory for SZ filter in HDF5PluginMacros.cmake.
Updates for release:
    Switch configure default to production mode.
    Set HDF5_GENERATE_HEADERS to OFF.

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Restores maintainer mode in the autotools (#200) (#203)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>

* Hdf5 1 8 22 (#212)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Brings ttsafe_attr_vlen.c changes from develop (#214)

Fixes exposed pthread problem on Windows.

* Update SO numbers for Hdf5 1 8 22 (#215)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Hdf5 1 8 22 (#224)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>

* Update CMake/HDF5Examples version in bin/release

* Update CMake/HDF5Examples version number in bin/release (#225)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>

* Fixed typo in an error message. (#228)

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* Bring 3 small changes from Hdf5 1.8 to 1.8.22 (#241)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Stat st blocks fix 1822 (#251)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* Fixes Autotools detection of the st_blocks field in stat (#246)

* Fixes Autotools detection of the st_blocks field in stat

The Autotools and CMake will now both correctly determine if the
stat struct has the st_blocks field and set H5_HAVE_STAT_ST_BLOCKS
appropriately.

* Fixes a typo in configure.ac

* Restore lines in RELEASE.txt.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Stat st blocks fix 1822 (#256)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* Fixes Autotools detection of the st_blocks field in stat (#246)

* Fixes Autotools detection of the st_blocks field in stat

The Autotools and CMake will now both correctly determine if the
stat struct has the st_blocks field and set H5_HAVE_STAT_ST_BLOCKS
appropriately.

* Fixes a typo in configure.ac

* Restore lines in RELEASE.txt.

* Updated configure with reconfigure.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* RELEASE.txt cleanup.

* Hdf5 1 8 22 (#261)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Hdf5 1 8 22 (#266)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Hdf5 1 8 22 - Reverts lock/unlock callback signature to 1.8.21 version (#267)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Update version in H5public.h

* Hdf5 1 8 22 (#269)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Update version in H5public.h

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Set version 1.8.22 for release.

* dd RELEASE.txt entry for HDFFV-10741.

* Hdf5 1 8 22 (#279)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Update version in H5public.h

* Set version 1.8.22 for release.

* dd RELEASE.txt entry for HDFFV-10741.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Improve performance of multiple calls to H5Sget_select_elem_pointlist (#270) (#277)

* Cache the pointer to the next point to process after the last call to
H5S__get_select_elem_pointlist.  This allows the normal process of
iterating over the points in batches to be much more efficient, as the
library does not need to traverse the entirety of the preceding points
every time the funciton is re-entered.

* Update RELEASE.txt for point selection iteration performance fix.

* Hdf5 1 8 22 (#281)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Update version in H5public.h

* Set version 1.8.22 for release.

* dd RELEASE.txt entry for HDFFV-10741.

* Improve performance of multiple calls to H5Sget_select_elem_pointlist (#270) (#277)

* Cache the pointer to the next point to process after the last call to
H5S__get_select_elem_pointlist.  This allows the normal process of
iterating over the points in batches to be much more efficient, as the
library does not need to traverse the entirety of the preceding points
every time the funciton is re-entered.

* Update RELEASE.txt for point selection iteration performance fix.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
Co-authored-by: Neil Fortner <nfortne2@hdfgroup.org>

* Hdf5 1 8 22 (#284)

* Fixed typo in an error message.

* Updated for HDFFV-11150, HDFFV-10480, and HDFFV-11159

* Update "Support for New Platforms and Compilers" section in RELEASE.txt;
add check_version workaround for binary compatibility to "Known
Problems".

* Add SUSE Linux to tested platforms.

* Update numbers in config/lt_vers.am and run bin/reconfigure for so
numbers.

* Update version in 3 files missed by merge.

Co-authored-by: Allen Byrne <byrn@hdfgroup.org>
Co-authored-by: Vailin Choi <vchoi@hdfgroup.org>
Co-authored-by: vchoi <vchoi@jelly.ad.hdfgroup.org>
Co-authored-by: hdftest <hdftest@hdfgroup.org>
Co-authored-by: Jordan Henderson <jhenderson@hdfgroup.org>
Co-authored-by: Dana Robinson <derobins@hdfgroup.org>
Co-authored-by: Binh-Minh Ribler <bmribler@hdfgroup.org>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Neil Fortner <nfortne2@hdfgroup.org>

1 files changed, 189 insertions, 174 deletions

diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index e24d654..df00067 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -23,77 +23,88 @@
 #include "hdf5.h"
 #include "h5tools_error.h"
 
-#define ESCAPE_HTML             1
-#define OPT(X,S)                ((X) ? (X) : (S))
-#define OPTIONAL_LINE_BREAK     "\001"  /* Special strings embedded in the output */
+#define ESCAPE_HTML         1
+#define OPT(X, S)           ((X) ? (X) : (S))
+#define OPTIONAL_LINE_BREAK "\001" /* Special strings embedded in the output */
 #define START_OF_DATA       0x0001
-#define END_OF_DATA     0x0002
+#define END_OF_DATA         0x0002
 
 /* format for hsize_t */
-#define HSIZE_T_FORMAT   "%" H5_PRINTF_LL_WIDTH "u"
+#define HSIZE_T_FORMAT "%" H5_PRINTF_LL_WIDTH "u"
 
-#define H5TOOLS_DUMP_MAX_RANK     H5S_MAX_RANK
+#define H5TOOLS_DUMP_MAX_RANK H5S_MAX_RANK
 
 /* Stream macros */
-#define FLUSHSTREAM(S)           if(S != NULL) HDfflush(S)
-#define PRINTSTREAM(S, F, ...)   if(S != NULL) HDfprintf(S, F, __VA_ARGS__)
-#define PRINTVALSTREAM(S, V)   if(S != NULL) HDfprintf(S, V)
-#define PUTSTREAM(X,S)          do { if(S != NULL) HDfputs(X, S); } while(0)
+#define FLUSHSTREAM(S)                                                                                       \
+    if (S != NULL)                                                                                           \
+    HDfflush(S)
+#define PRINTSTREAM(S, F, ...)                                                                               \
+    if (S != NULL)                                                                                           \
+    HDfprintf(S, F, __VA_ARGS__)
+#define PRINTVALSTREAM(S, V)                                                                                 \
+    if (S != NULL)                                                                                           \
+    HDfprintf(S, V)
+#define PUTSTREAM(X, S)                                                                                      \
+    do {                                                                                                     \
+        if (S != NULL)                                                                                       \
+            HDfputs(X, S);                                                                                   \
+    } while (0)
 
 /*
  * Strings for output - these were duplicated from the h5dump.h
  * file in order to support region reference data display
  */
-#define ATTRIBUTE       "ATTRIBUTE"
-#define BLOCK           "BLOCK"
-#define SUPER_BLOCK     "SUPER_BLOCK"
-#define COMPRESSION     "COMPRESSION"
-#define CONCATENATOR    "//"
-#define COMPLEX         "COMPLEX"
-#define COUNT           "COUNT"
-#define CSET            "CSET"
-#define CTYPE           "CTYPE"
-#define DATA            "DATA"
-#define DATASPACE       "DATASPACE"
-#define EXTERNAL        "EXTERNAL"
-#define FILENO          "FILENO"
-#define HARDLINK        "HARDLINK"
-#define NLINK           "NLINK"
-#define OBJID           "OBJECTID"
-#define OBJNO           "OBJNO"
-#define S_SCALAR        "SCALAR"
-#define S_SIMPLE        "SIMPLE"
-#define S_NULL          "NULL"
-#define SOFTLINK        "SOFTLINK"
-#define EXTLINK         "EXTERNAL_LINK"
-#define UDLINK          "USERDEFINED_LINK"
-#define START           "START"
-#define STRIDE          "STRIDE"
-#define STRSIZE         "STRSIZE"
-#define STRPAD          "STRPAD"
-#define SUBSET          "SUBSET"
-#define FILTERS         "FILTERS"
-#define DEFLATE         "COMPRESSION DEFLATE"
-#define DEFLATE_LEVEL   "LEVEL"
-#define SHUFFLE         "PREPROCESSING SHUFFLE"
-#define FLETCHER32      "CHECKSUM FLETCHER32"
-#define SZIP            "COMPRESSION SZIP"
-#define NBIT            "COMPRESSION NBIT"
-#define SCALEOFFSET     "COMPRESSION SCALEOFFSET"
-#define SCALEOFFSET_MINBIT            "MIN BITS"
-#define STORAGE_LAYOUT  "STORAGE_LAYOUT"
-#define CONTIGUOUS      "CONTIGUOUS"
-#define COMPACT         "COMPACT"
-#define CHUNKED         "CHUNKED"
-#define EXTERNAL_FILE   "EXTERNAL_FILE"
-#define FILLVALUE       "FILLVALUE"
-#define FILE_CONTENTS   "FILE_CONTENTS"
-#define PACKED_BITS     "PACKED_BITS"
-#define PACKED_OFFSET   "OFFSET"
-#define PACKED_LENGTH   "LENGTH"
-
-#define BEGIN           "{"
-#define END             "}"
+#define ATTRIBUTE          "ATTRIBUTE"
+#define BLOCK              "BLOCK"
+#define SUPER_BLOCK        "SUPER_BLOCK"
+#define COMPRESSION        "COMPRESSION"
+#define CONCATENATOR       "//"
+#define COMPLEX            "COMPLEX"
+#define COUNT              "COUNT"
+#define CSET               "CSET"
+#define CTYPE              "CTYPE"
+#define DATA               "DATA"
+#define DATASPACE          "DATASPACE"
+#define EXTERNAL           "EXTERNAL"
+#define FILENO             "FILENO"
+#define HARDLINK           "HARDLINK"
+#define NLINK              "NLINK"
+#define OBJID              "OBJECTID"
+#define OBJNO              "OBJNO"
+#define S_SCALAR           "SCALAR"
+#define S_SIMPLE           "SIMPLE"
+#define S_NULL             "NULL"
+#define SOFTLINK           "SOFTLINK"
+#define EXTLINK            "EXTERNAL_LINK"
+#define UDLINK             "USERDEFINED_LINK"
+#define START              "START"
+#define STRIDE             "STRIDE"
+#define STRSIZE            "STRSIZE"
+#define STRPAD             "STRPAD"
+#define SUBSET             "SUBSET"
+#define FILTERS            "FILTERS"
+#define DEFLATE            "COMPRESSION DEFLATE"
+#define DEFLATE_LEVEL      "LEVEL"
+#define SHUFFLE            "PREPROCESSING SHUFFLE"
+#define FLETCHER32         "CHECKSUM FLETCHER32"
+#define SZIP               "COMPRESSION SZIP"
+#define NBIT               "COMPRESSION NBIT"
+#define SCALEOFFSET        "COMPRESSION SCALEOFFSET"
+#define SCALEOFFSET_MINBIT "MIN BITS"
+#define STORAGE_LAYOUT     "STORAGE_LAYOUT"
+#define CONTIGUOUS         "CONTIGUOUS"
+#define COMPACT            "COMPACT"
+#define CHUNKED            "CHUNKED"
+#define EXTERNAL_FILE      "EXTERNAL_FILE"
+#define FILLVALUE          "FILLVALUE"
+#define FILE_CONTENTS      "FILE_CONTENTS"
+#define PACKED_BITS        "PACKED_BITS"
+#define PACKED_OFFSET      "OFFSET"
+#define PACKED_LENGTH      "LENGTH"
+#define REGION             "REGION"
+
+#define BEGIN "{"
+#define END   "}"
 
 /*
  * dump structure for output - this was duplicated from the h5dump.h
@@ -258,19 +269,19 @@ typedef struct h5tool_format_t {
      * Numeric data is also subject to the formats for individual elements.
      */
     hbool_t     raw;
-    const char  *fmt_raw;
-    const char  *fmt_int;
-    const char  *fmt_uint;
-    const char  *fmt_schar;
-    const char  *fmt_uchar;
-    const char  *fmt_short;
-    const char  *fmt_ushort;
-    const char  *fmt_long;
-    const char  *fmt_ulong;
-    const char  *fmt_llong;
-    const char  *fmt_ullong;
-    const char  *fmt_double;
-    const char  *fmt_float;
+    const char *fmt_raw;
+    const char *fmt_int;
+    const char *fmt_uint;
+    const char *fmt_schar;
+    const char *fmt_uchar;
+    const char *fmt_short;
+    const char *fmt_ushort;
+    const char *fmt_long;
+    const char *fmt_ulong;
+    const char *fmt_llong;
+    const char *fmt_ullong;
+    const char *fmt_double;
+    const char *fmt_float;
     int         ascii;
     int         str_locale;
     unsigned    str_repeat;
@@ -291,9 +302,9 @@ typedef struct h5tool_format_t {
      *   linebreaks: a boolean value to determine if we want to break the line
      *               after each row of an array.
      */
-    const char  *arr_pre;
-    const char  *arr_sep;
-    const char  *arr_suf;
+    const char *arr_pre;
+    const char *arr_sep;
+    const char *arr_suf;
     int         arr_linebreak;
 
     /*
@@ -318,11 +329,11 @@ typedef struct h5tool_format_t {
      *   end:       a string to print after we reach the last element of
      *              each compound type. prints out before the suf.
      */
-    const char  *cmpd_name;
-    const char  *cmpd_sep;
-    const char  *cmpd_pre;
-    const char  *cmpd_suf;
-    const char  *cmpd_end;
+    const char *cmpd_name;
+    const char *cmpd_sep;
+    const char *cmpd_pre;
+    const char *cmpd_suf;
+    const char *cmpd_end;
 
     /*
      * Fields associated with vlen data types.
@@ -341,10 +352,10 @@ typedef struct h5tool_format_t {
      *   end:       a string to print after we reach the last element of
      *              each compound type. prints out before the suf.
      */
-    const char  *vlen_sep;
-    const char  *vlen_pre;
-    const char  *vlen_suf;
-    const char  *vlen_end;
+    const char *vlen_sep;
+    const char *vlen_pre;
+    const char *vlen_suf;
+    const char *vlen_end;
 
     /*
      * Fields associated with the individual elements.
@@ -360,9 +371,9 @@ typedef struct h5tool_format_t {
      *              are followed on the same line by another element.  The
      *              default is a single space.
      */
-    const char  *elmt_fmt;
-    const char  *elmt_suf1;
-    const char  *elmt_suf2;
+    const char *elmt_fmt;
+    const char *elmt_suf1;
+    const char *elmt_suf2;
 
     /*
      * Fields associated with the index values printed at the left edge of
@@ -381,9 +392,9 @@ typedef struct h5tool_format_t {
      *              printf(3c) format which should include a format for a
      *              character string.  The default is "%s".
      */
-    const char  *idx_n_fmt;             /*index number format           */
-    const char  *idx_sep;               /*separator between numbers     */
-    const char  *idx_fmt;               /*entire index format           */
+    const char *idx_n_fmt; /*index number format           */
+    const char *idx_sep;   /*separator between numbers     */
+    const char *idx_fmt;   /*entire index format           */
 
     /*
      * Fields associated with entire lines.
@@ -439,23 +450,23 @@ typedef struct h5tool_format_t {
      * indentlevel: a string that shows how far to indent if extra spacing
      *              is needed. dumper uses it.
      */
-    unsigned    line_ncols;             /*columns of output             */
-    size_t      line_per_line;          /*max elements per line         */
-    const char  *line_pre;              /*prefix at front of each line  */
-    const char  *line_1st;              /*alternate pre. on first line  */
-    const char  *line_cont;             /*alternate pre. on continuation*/
-    const char  *line_suf;              /*string to append to each line */
-    const char  *line_sep;              /*separates lines               */
-    int         line_multi_new;         /*split multi-line outputs?     */
-    const char  *line_indent;           /*for extra identation if we need it*/
+    unsigned    line_ncols;     /*columns of output             */
+    size_t      line_per_line;  /*max elements per line         */
+    const char *line_pre;       /*prefix at front of each line  */
+    const char *line_1st;       /*alternate pre. on first line  */
+    const char *line_cont;      /*alternate pre. on continuation*/
+    const char *line_suf;       /*string to append to each line */
+    const char *line_sep;       /*separates lines               */
+    int         line_multi_new; /*split multi-line outputs?     */
+    const char *line_indent;    /*for extra identation if we need it*/
 
     /*used to skip the first set of checks for line length*/
     int skip_first;
 
-    /*flag used to hide or show the file number for obj refs*/
+    /*flag used to hide or show the file number for object refs*/
     int obj_hidefileno;
 
-    /*string used to format the output for the obje refs*/
+    /*string used to format the output for the object refs*/
     const char *obj_format;
 
     /*flag used to hide or show the file number for dataset regions*/
@@ -476,29 +487,8 @@ typedef struct h5tool_format_t {
 
 } h5tool_format_t;
 
-typedef struct h5tools_context_t {
-    size_t cur_column;                       /*current column for output */
-    size_t cur_elmt;                         /*current element/output line */
-    int  need_prefix;                        /*is line prefix needed? */
-    unsigned ndims;                          /*dimensionality  */
-    hsize_t p_min_idx[H5S_MAX_RANK];         /*min selected index */
-    hsize_t p_max_idx[H5S_MAX_RANK];         /*max selected index */
-    int  prev_multiline;                     /*was prev datum multiline? */
-    size_t prev_prefix_len;                  /*length of previous prefix */
-    int  continuation;                       /*continuation of previous data?*/
-    hsize_t size_last_dim;                   /*the size of the last dimension,
-                                              *needed so we can break after each
-                                              *row */
-    unsigned  indent_level;                /*the number of times we need some
-                                       *extra indentation */
-    unsigned  default_indent_level;        /*this is used when the indent level gets changed */
-    hsize_t acc[H5S_MAX_RANK];        /* accumulator position */
-    hsize_t pos[H5S_MAX_RANK];        /* matrix position */
-    hsize_t sm_pos;                   /* current stripmine element position */
-} h5tools_context_t;
-
 typedef struct subset_d {
-    hsize_t     *data;
+    hsize_t *    data;
     unsigned int len;
 } subset_d;
 
@@ -510,47 +500,70 @@ struct subset_t {
     subset_d block;
 };
 
+typedef struct h5tools_context_t {
+    size_t   cur_column;              /* current column for output */
+    size_t   cur_elmt;                /* current element/output line */
+    int      need_prefix;             /* is line prefix needed? */
+    unsigned ndims;                   /* dimensionality  */
+    hsize_t  p_min_idx[H5S_MAX_RANK]; /* min selected index */
+    hsize_t  p_max_idx[H5S_MAX_RANK]; /* max selected index */
+    int      prev_multiline;          /* was prev datum multiline? */
+    size_t   prev_prefix_len;         /* length of previous prefix */
+    int      continuation;            /* continuation of previous data?*/
+    hsize_t  size_last_dim;        /* the size of the last dimension, needed so we can break after each row */
+    unsigned indent_level;         /* the number of times we need some extra indentation */
+    unsigned default_indent_level; /* this is used when the indent level gets changed */
+    hsize_t  acc[H5S_MAX_RANK];    /* accumulator position */
+    hsize_t  pos[H5S_MAX_RANK];    /* matrix position */
+    hsize_t  sm_pos;               /* current stripmine element position */
+    struct subset_t *sset;         /* subsetting parameters */
+    int              display_index; /* */
+    int              display_char;  /* */
+} h5tools_context_t;
+
 /* The following include, h5tools_str.h, must be after the
  * above stucts are defined. There is a dependency in the following
  * include that hasn't been identified yet. */
 
 #include "h5tools_str.h"
 
-H5TOOLS_DLLVAR h5tool_format_t h5tools_dataformat;
+H5TOOLS_DLLVAR h5tool_format_t             h5tools_dataformat;
 H5TOOLS_DLLVAR const h5tools_dump_header_t h5tools_standardformat;
-H5TOOLS_DLLVAR const h5tools_dump_header_t* h5tools_dump_header_format;
+H5TOOLS_DLLVAR const h5tools_dump_header_t *h5tools_dump_header_format;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-H5TOOLS_DLLVAR unsigned packed_bits_num;    /* number of packed bits to display */
-H5TOOLS_DLLVAR unsigned packed_data_offset; /* offset of packed bits to display */
-H5TOOLS_DLLVAR unsigned packed_data_length; /* length of packed bits to display */
-H5TOOLS_DLLVAR unsigned long long packed_data_mask;  /* mask in which packed bits to display */
-H5TOOLS_DLLVAR FILE   *rawattrstream;       /* output stream for raw attribute data */
-H5TOOLS_DLLVAR FILE   *rawdatastream;       /* output stream for raw data */
-H5TOOLS_DLLVAR FILE   *rawinstream;         /* input stream for raw input */
-H5TOOLS_DLLVAR FILE   *rawoutstream;        /* output stream for raw output */
-H5TOOLS_DLLVAR FILE   *rawerrorstream;      /* output stream for raw error */
-H5TOOLS_DLLVAR int     bin_output;          /* binary output */
-H5TOOLS_DLLVAR int     bin_form;            /* binary form */
-H5TOOLS_DLLVAR int     region_output;       /* region output */
-H5TOOLS_DLLVAR int     oid_output;          /* oid output */
-H5TOOLS_DLLVAR int     data_output;         /* data output */
-H5TOOLS_DLLVAR int     attr_data_output;    /* attribute data output */
+H5TOOLS_DLLVAR unsigned           packed_bits_num;    /* number of packed bits to display */
+H5TOOLS_DLLVAR unsigned           packed_data_offset; /* offset of packed bits to display */
+H5TOOLS_DLLVAR unsigned           packed_data_length; /* length of packed bits to display */
+H5TOOLS_DLLVAR unsigned long long packed_data_mask;   /* mask in which packed bits to display */
+H5TOOLS_DLLVAR FILE *rawattrstream;                   /* output stream for raw attribute data */
+H5TOOLS_DLLVAR FILE *rawdatastream;                   /* output stream for raw data */
+H5TOOLS_DLLVAR FILE *rawinstream;                     /* input stream for raw input */
+H5TOOLS_DLLVAR FILE *rawoutstream;                    /* output stream for raw output */
+H5TOOLS_DLLVAR FILE *rawerrorstream;                  /* output stream for raw error */
+H5TOOLS_DLLVAR int   bin_output;                      /* binary output */
+H5TOOLS_DLLVAR int   bin_form;                        /* binary form */
+H5TOOLS_DLLVAR int   region_output;                   /* region output */
+H5TOOLS_DLLVAR int   oid_output;                      /* oid output */
+H5TOOLS_DLLVAR int   data_output;                     /* data output */
+H5TOOLS_DLLVAR int   attr_data_output;                /* attribute data output */
 
 /* sort parameters */
-H5TOOLS_DLLVAR H5_index_t   sort_by;        /*sort_by [creation_order | name]  */
-H5TOOLS_DLLVAR H5_iter_order_t sort_order;  /*sort_order [ascending | descending]   */
+H5TOOLS_DLLVAR H5_index_t      sort_by;    /* sort_by [creation_order | name]  */
+H5TOOLS_DLLVAR H5_iter_order_t sort_order; /* sort_order [ascending | descending]   */
 
 /* things to display or which are set via command line parameters */
-H5TOOLS_DLLVAR int     enable_error_stack; /* re-enable error stack; disable=0 enable=1 */
+H5TOOLS_DLLVAR int enable_error_stack; /* re-enable error stack; disable=0 enable=1 */
 
 /* Strings for output */
-#define H5_TOOLS_GROUP           "GROUP"
-#define H5_TOOLS_DATASET         "DATASET"
-#define H5_TOOLS_DATATYPE        "DATATYPE"
+#define H5_TOOLS_GROUP     "GROUP"
+#define H5_TOOLS_DATASET   "DATASET"
+#define H5_TOOLS_DATATYPE  "DATATYPE"
+#define H5_TOOLS_ATTRIBUTE "ATTRIBUTE"
+#define H5_TOOLS_UNKNOWN   "UNKNOWN"
 
 /* Definitions of useful routines */
 H5TOOLS_DLL void    h5tools_init(void);
@@ -560,8 +573,8 @@ H5TOOLS_DLL int     h5tools_set_attr_output_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_input_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_output_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_error_file(const char *fname, int is_bin);
-H5TOOLS_DLL hid_t   h5tools_fopen(const char *fname, unsigned flags, hid_t fapl,
-                            const char *driver, char *drivername, size_t drivername_len);
+H5TOOLS_DLL hid_t   h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, const char *driver,
+                                  char *drivername, size_t drivername_len);
 H5TOOLS_DLL hid_t   h5tools_get_little_endian_type(hid_t type);
 H5TOOLS_DLL hid_t   h5tools_get_big_endian_type(hid_t type);
 H5TOOLS_DLL htri_t  h5tools_detect_vlen(hid_t tid);
@@ -569,38 +582,40 @@ H5TOOLS_DLL htri_t  h5tools_detect_vlen_str(hid_t tid);
 H5TOOLS_DLL hbool_t h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2);
 H5TOOLS_DLL void    init_acc_pos(h5tools_context_t *ctx, hsize_t *dims);
 H5TOOLS_DLL hbool_t h5tools_is_zero(const void *_mem, size_t size);
-H5TOOLS_DLL int     h5tools_canreadf(const char* name,  hid_t dcpl_id);
+H5TOOLS_DLL int     h5tools_canreadf(const char *name, hid_t dcpl_id);
 H5TOOLS_DLL int     h5tools_can_encode(H5Z_filter_t filtn);
 
-H5TOOLS_DLL void    h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, hsize_t elmtno, int secnum);
-H5TOOLS_DLL void    h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, hsize_t elmtno, hsize_t *ptdata, int secnum);
+H5TOOLS_DLL void h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                                       hsize_t elmtno, int secnum);
+H5TOOLS_DLL void h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
+                                              h5tools_context_t *ctx, hsize_t elmtno, hsize_t *ptdata,
+                                              int secnum);
 
 H5TOOLS_DLL int     render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t nelmts);
-H5TOOLS_DLL int     render_bin_output_region_data_blocks(hid_t region_id, FILE *stream,
-                            hid_t container, unsigned ndims, hid_t type_id, hsize_t nblocks, hsize_t *ptdata);
-H5TOOLS_DLL hbool_t render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
-                             FILE *stream, hid_t container);
-H5TOOLS_DLL int     render_bin_output_region_data_points(hid_t region_space, hid_t region_id,
-                            FILE* stream, hid_t container, unsigned ndims, hid_t type_id, hsize_t npoints);
-H5TOOLS_DLL hbool_t render_bin_output_region_points(hid_t region_space, hid_t region_id,
-                             FILE *stream, hid_t container);
-
-H5TOOLS_DLL hbool_t h5tools_render_element(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx, h5tools_str_t *buffer, hsize_t *curr_pos,
-                            size_t ncols, hsize_t local_elmt_counter, hsize_t elmt_counter);
+H5TOOLS_DLL int     render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t container,
+                                                         unsigned ndims, hid_t type_id, hsize_t nblocks,
+                                                         hsize_t *ptdata);
+H5TOOLS_DLL hbool_t render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream,
+                                                    hid_t container);
+H5TOOLS_DLL int     render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE *stream,
+                                                         hid_t container, unsigned ndims, hid_t type_id,
+                                                         hsize_t npoints);
+H5TOOLS_DLL hbool_t render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream,
+                                                    hid_t container);
+
+H5TOOLS_DLL hbool_t h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                                           h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols,
+                                           hsize_t local_elmt_counter, hsize_t elmt_counter);
 H5TOOLS_DLL hbool_t h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
-                h5tools_context_t *ctx/*in,out*/,
-                h5tools_str_t *buffer/*string into which to render */,
-                hsize_t *curr_pos/*total data element position*/,
-                size_t ncols, hsize_t *ptdata,
-                hsize_t local_elmt_counter/*element counter*/,
-                hsize_t elmt_counter);
+                                                  h5tools_context_t *ctx,    /*in,out*/
+                                                  h5tools_str_t *    buffer, /*string into which to render */
+                                                  hsize_t *          curr_pos, /*total data element position*/
+                                                  size_t ncols, hsize_t *ptdata,
+                                                  hsize_t local_elmt_counter, /*element counter*/
+                                                  hsize_t elmt_counter);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* H5TOOLS_H__ */
-