Changes found during merge to 1.12 (#414)

* 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

16 files changed, 51 insertions, 49 deletions

diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 12e5bb2..283989d 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -458,4 +458,4 @@ H5_DLL hbool_t H5AC_get_serialization_in_progress(H5F_t *f);
 H5_DLL hbool_t H5AC_cache_is_clean(const H5F_t *f, H5AC_ring_t inner_ring);
 #endif /* NDEBUG */ /* end debugging functions */
 
-#endif /* !_H5ACprivate_H */
+#endif /* H5ACprivate_H */
diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h
index ac28ee6..0a79628 100644
--- a/src/H5Bpkg.h
+++ b/src/H5Bpkg.h
@@ -12,12 +12,12 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol
- *		Thursday, May 15, 2003
+ * Programmer:    Quincey Koziol
+ *        Thursday, May 15, 2003
  *
- * Purpose:	This file contains declarations which are visible only within
- *		the H5B package.  Source files outside the H5B package should
- *		include H5Bprivate.h instead.
+ * Purpose:    This file contains declarations which are visible only within
+ *        the H5B package.  Source files outside the H5B package should
+ *        include H5Bprivate.h instead.
  */
 #if !(defined H5B_FRIEND || defined H5B_MODULE)
 #error "Do not include this file outside the H5B package!"
@@ -30,7 +30,7 @@
 #include "H5Bprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5ACprivate.h" /* Metadata cache            */
 #include "H5FLprivate.h" /* Free Lists                           */
 
 /**************************/
@@ -49,20 +49,20 @@
 typedef struct H5B_t {
     H5AC_info_t cache_info; /* Information for H5AC cache functions */
                             /* _must_ be first field in structure */
-    H5UC_t * rc_shared;     /*ref-counted shared info	     */
-    unsigned level;         /*node level			     */
-    unsigned nchildren;     /*number of child pointers	     */
-    haddr_t  left;          /*address of left sibling	     */
-    haddr_t  right;         /*address of right sibling	     */
+    H5UC_t * rc_shared;     /*ref-counted shared info         */
+    unsigned level;         /*node level                 */
+    unsigned nchildren;     /*number of child pointers         */
+    haddr_t  left;          /*address of left sibling         */
+    haddr_t  right;         /*address of right sibling         */
     uint8_t *native;        /*array of keys in native format     */
-    haddr_t *child;         /*2k child pointers		     */
+    haddr_t *child;         /*2k child pointers             */
 } H5B_t;
 
 /* Callback info for loading a B-tree node into the cache */
 typedef struct H5B_cache_ud_t {
     H5F_t *                   f;         /* File that B-tree node is within   */
-    const struct H5B_class_t *type;      /* Type of tree			     */
-    H5UC_t *                  rc_shared; /* Ref-counted shared info	     */
+    const struct H5B_class_t *type;      /* Type of tree                 */
+    H5UC_t *                  rc_shared; /* Ref-counted shared info         */
 } H5B_cache_ud_t;
 
 /*****************************/
@@ -86,4 +86,4 @@ H5_DLL herr_t H5B__node_dest(H5B_t *bt);
 herr_t H5B__assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata);
 #endif
 
-#endif /*_H5Bpkg_H*/
+#endif /*H5Bpkg_H*/
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 623e52f..fb5c3ea 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -2321,4 +2321,4 @@ H5_DLL herr_t  H5C_verify_entry_type(H5C_t *cache_ptr, haddr_t addr, const H5C_c
 H5_DLL herr_t  H5C_validate_index_list(H5C_t *cache_ptr);
 #endif /* NDEBUG */
 
-#endif /* !_H5Cprivate_H */
+#endif /* H5Cprivate_H */
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index de04ac9..61b1a87 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -739,4 +739,4 @@ H5_DLL herr_t H5D__layout_type_test(hid_t did, H5D_layout_t *layout_type);
 H5_DLL herr_t H5D__current_cache_size_test(hid_t did, size_t *nbytes_used, int *nused);
 #endif /* H5D_TESTING */
 
-#endif /*_H5Dpkg_H*/
+#endif /*H5Dpkg_H*/
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 1deef04..cf3167f 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -32,8 +32,8 @@ typedef enum H5E_type_t { H5E_MAJOR, H5E_MINOR } H5E_type_t;
 /* Information about an error; element of error stack */
 typedef struct H5E_error2_t {
     hid_t       cls_id;    /*class ID                           */
-    hid_t       maj_num;   /*major error ID		     */
-    hid_t       min_num;   /*minor error number		     */
+    hid_t       maj_num;   /*major error ID             */
+    hid_t       min_num;   /*minor error number             */
     unsigned    line;      /*line in file where error occurs    */
     const char *func_name; /*function in which error occurred   */
     const char *file_name; /*file in which error occurred       */
@@ -61,12 +61,12 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g;
  * trying something that's likely or expected to fail.  The code to try can
  * be nested between calls to H5Eget_auto() and H5Eset_auto(), but it's
  * easier just to use this macro like:
- * 	H5E_BEGIN_TRY {
- *	    ...stuff here that's likely to fail...
+ *     H5E_BEGIN_TRY {
+ *        ...stuff here that's likely to fail...
  *      } H5E_END_TRY;
  *
  * Warning: don't break, return, or longjmp() from the body of the loop or
- *	    the error reporting won't be properly restored!
+ *        the error reporting won't be properly restored!
  *
  * These two macros still use the old API functions for backward compatibility
  * purpose.
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index e468554..68440d0 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -2002,7 +2002,7 @@ open_members(H5FD_multi_t *file)
 }
 H5_GCC_DIAG_ON("format-nonliteral")
 
-#ifdef _H5private_H
+#ifdef H5private_H
 /*
  * This is not related to the functionality of the driver code.
  * It is added here to trigger warning if HDF5 private definitions are included
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index 2d5f5fa..10d8069 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -159,4 +159,4 @@ H5_DLL int      H5FD_mpi_get_size(const H5FD_t *file);
 H5_DLL MPI_Comm H5FD_mpi_get_comm(const H5FD_t *_file);
 #endif /* H5_HAVE_PARALLEL */
 
-#endif /* !_H5FDprivate_H */
+#endif /* H5FDprivate_H */
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index efc1802..b395127 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -1201,7 +1201,7 @@ H5FD_stdio_unlock(H5FD_t *_file)
     return 0;
 } /* end H5FD_stdio_unlock() */
 
-#ifdef _H5private_H
+#ifdef H5private_H
 /*
  * This is not related to the functionality of the driver code.
  * It is added here to trigger warning if HDF5 private definitions are included
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index bebbfe6..86b6e1b 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -30,12 +30,12 @@
 #include "H5Gprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5B2private.h" /* v2 B-trees				*/
+#include "H5B2private.h" /* v2 B-trees                */
 #include "H5FLprivate.h" /* Free Lists                           */
-#include "H5HFprivate.h" /* Fractal heaps			*/
-#include "H5HLprivate.h" /* Local Heaps				*/
-#include "H5Oprivate.h"  /* Object headers		  	*/
-#include "H5SLprivate.h" /* Skip lists				*/
+#include "H5HFprivate.h" /* Fractal heaps            */
+#include "H5HLprivate.h" /* Local Heaps                */
+#include "H5Oprivate.h"  /* Object headers              */
+#include "H5SLprivate.h" /* Skip lists                */
 
 /**************************/
 /* Package Private Macros */
@@ -66,10 +66,10 @@
  * symbol table entry.
  */
 typedef enum H5G_cache_type_t {
-    H5G_CACHED_ERROR   = -1, /*force enum to be signed		     */
+    H5G_CACHED_ERROR   = -1, /*force enum to be signed             */
     H5G_NOTHING_CACHED = 0,  /*nothing is cached, must be 0               */
     H5G_CACHED_STAB    = 1,  /*symbol table, `stab'                       */
-    H5G_CACHED_SLINK   = 2,  /*symbolic link				     */
+    H5G_CACHED_SLINK   = 2,  /*symbolic link                     */
 
     H5G_NCACHED /*THIS MUST BE LAST                          */
 } H5G_cache_type_t;
@@ -88,7 +88,7 @@ typedef union H5G_cache_t {
     } stab;
 
     struct {
-        size_t lval_offset; /*link value offset		     */
+        size_t lval_offset; /*link value offset             */
     } slink;
 } H5G_cache_t;
 
@@ -157,7 +157,7 @@ typedef struct {
 typedef struct H5G_bt_common_t {
     /* downward */
     const char *name; /*points to temporary memory         */
-    H5HL_t *    heap; /*symbol table heap		     */
+    H5HL_t *    heap; /*symbol table heap             */
 } H5G_bt_common_t;
 
 /*
@@ -204,10 +204,10 @@ typedef struct H5G_bt_lkp_t {
  */
 typedef struct H5G_bt_it_it_t {
     /* downward */
-    H5HL_t *          heap;    /*symbol table heap 			     */
-    hsize_t           skip;    /*initial entries to skip		     */
-    H5G_lib_iterate_t op;      /*iteration operator			     */
-    void *            op_data; /*user-defined operator data		     */
+    H5HL_t *          heap;    /*symbol table heap                  */
+    hsize_t           skip;    /*initial entries to skip             */
+    H5G_lib_iterate_t op;      /*iteration operator                 */
+    void *            op_data; /*user-defined operator data             */
 
     /* upward */
     hsize_t *final_ent; /*final entry looked at                      */
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index b9f83c4..409d790 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -29,9 +29,9 @@
 #include "H5Gpublic.h"
 
 /* Private headers needed by this file */
-#include "H5private.h"   /* Generic Functions			*/
-#include "H5Bprivate.h"  /* B-trees				*/
-#include "H5Fprivate.h"  /* File access				*/
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Bprivate.h"  /* B-trees                */
+#include "H5Fprivate.h"  /* File access                */
 #include "H5RSprivate.h" /* Reference-counted strings            */
 
 /*
@@ -42,7 +42,7 @@
     ((sizeof_size) +     /*offset of name into heap              */                                          \
      (sizeof_addr) +     /*address of object header              */                                          \
      4 +                 /*entry type                            */                                          \
-     4 +                 /*reserved				*/                                                                    \
+     4 +                 /*reserved                */                                                        \
      H5G_SIZEOF_SCRATCH) /*scratch pad space                     */
 #define H5G_SIZEOF_ENTRY_FILE(F) H5G_SIZEOF_ENTRY(H5F_SIZEOF_ADDR(F), H5F_SIZEOF_SIZE(F))
 
diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h
index 4cec8c6..0a7215b 100644
--- a/src/H5Ipkg.h
+++ b/src/H5Ipkg.h
@@ -116,4 +116,4 @@ H5_DLL H5I_id_info_t *H5I__find_id(hid_t id);
 H5_DLL ssize_t H5I__get_name_test(hid_t id, char *name /*out*/, size_t size, hbool_t *cached);
 #endif /* H5I_TESTING */
 
-#endif /*_H5Ipkg_H*/
+#endif /*H5Ipkg_H*/
diff --git a/src/H5Mpkg.h b/src/H5Mpkg.h
index b31beeb..be6749b 100644
--- a/src/H5Mpkg.h
+++ b/src/H5Mpkg.h
@@ -44,4 +44,4 @@
 /* Package Private Prototypes */
 /******************************/
 
-#endif /*_H5Dpkg_H*/
+#endif /*H5Dpkg_H*/
diff --git a/src/H5PBprivate.h b/src/H5PBprivate.h
index e152193..e0197bf 100644
--- a/src/H5PBprivate.h
+++ b/src/H5PBprivate.h
@@ -98,4 +98,4 @@ H5_DLL herr_t H5PB_get_stats(const H5PB_t *page_buf, unsigned accesses[2], unsig
                              unsigned misses[2], unsigned evictions[2], unsigned bypasses[2]);
 H5_DLL herr_t H5PB_print_stats(const H5PB_t *page_buf);
 
-#endif /* !_H5PBprivate_H */
+#endif /* H5PBprivate_H */
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index 9ab2b17..c3555bc 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -100,7 +100,9 @@ H5_DLL herr_t H5PLset_loading_state(unsigned int plugin_control_mask);
  *                                 A plugin bit set to 1 (one) indicates that that the dynamic plugin type is
  *                                 enabled.\n
  *                                 If the value of \p plugin_control_mask is negative, all dynamic plugin
- * types are enabled.\n If the value of \p plugin_control_mask is 0 (zero), all dynamic plugins are disabled.
+ *                                 types are enabled.\n
+ *                                 If the value of \p plugin_control_mask is 0 (zero), all dynamic plugins
+ *                                 are disabled.
  * \return \herr_t
  *
  * \details H5PLget_loading_state() retrieves the bitmask that controls whether a certain type of plugins
diff --git a/src/H5SMprivate.h b/src/H5SMprivate.h
index f425074..efe9355 100644
--- a/src/H5SMprivate.h
+++ b/src/H5SMprivate.h
@@ -66,4 +66,4 @@ H5_DLL herr_t H5SM_table_debug(H5F_t *f, haddr_t table_addr, FILE *stream, int i
 H5_DLL herr_t H5SM_list_debug(H5F_t *f, haddr_t list_addr, FILE *stream, int indent, int fwidth,
                               haddr_t table_addr);
 
-#endif /*_H5SMprivate_H*/
+#endif /*H5SMprivate_H*/
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 33d1ede..ae6efcb 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -420,4 +420,4 @@ H5_DLL herr_t H5S__get_diminfo_status_test(hid_t space_id, H5S_diminfo_valid_t *
 H5_DLL htri_t H5S__internal_consistency_test(hid_t space_id);
 #endif /* H5S_TESTING */
 
-#endif /*_H5Spkg_H*/
+#endif /*H5Spkg_H*/