Merge remote-tracking branch 'canonical/hdf5_1_12' into 12_windows_st…

…atic_threadsafe
derobins · Oct 4, 2023 · 8d0ed39 · 8d0ed39
2 parents 7f35700 + 069688c
commit 8d0ed39
Show file tree

Hide file tree

Showing 58 changed files with 83 additions and 83 deletions.
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
@@ -331,7 +331,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
       set (CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
       set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
     endif ()
-    # set the install/unistall icon used for the installer itself
+    # set the install/uninstall icon used for the installer itself
     # There is a bug in NSI that does not handle full unix paths properly.
     set (CPACK_NSIS_MUI_ICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
     set (CPACK_NSIS_MUI_UNIICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")

diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake
@@ -1474,7 +1474,7 @@ function (create_javah)
       "CLASSES;CLASSPATH;DEPENDS"
       ${ARGN})
 
-    # ckeck parameters
+    # check parameters
     if (NOT _create_javah_TARGET AND NOT _create_javah_GENERATED_FILES)
       message (FATAL_ERROR "create_javah: TARGET or GENERATED_FILES must be specified.")
     endif()

diff --git a/doxygen/examples/H5.format.1.0.html b/doxygen/examples/H5.format.1.0.html
@@ -2020,7 +2020,7 @@ <h4><a name="DataSpaceMessage">Name: Complex Dataspace (Fiber Bundle?)</a></h4>
 	<dl>
 	  <dt>Mesh Type: (unsigned 32-bit integer)
 	  <dd>This value indicates whether the grid is
-	    polar/spherical/cartesion,
+	    polar/spherical/cartesian,
 	    structured/unstructured and regular/irregular. <br>
 	    The mesh type value is broken up as follows: <br>
 

diff --git a/doxygen/examples/H5.format.1.1.html b/doxygen/examples/H5.format.1.1.html
@@ -2596,7 +2596,7 @@ <h4><a name="DataSpaceMessage">Name: Complex Dataspace (Fiber Bundle?)</a></h4>
 	<dl>
 	  <dt>Mesh Type: (unsigned 32-bit integer)
 	  <dd>This value indicates whether the grid is
-	    polar/spherical/cartesion,
+	    polar/spherical/cartesian,
 	    structured/unstructured and regular/irregular. <br>
 	    The mesh type value is broken up as follows: <br>
 

diff --git a/doxygen/examples/H5.format.2.0.html b/doxygen/examples/H5.format.2.0.html
@@ -8458,7 +8458,7 @@ <h4><a name="DataSpaceMessage">Header Message Name: Complex Dataspace (Fiber Bun
     <dl>
       <dt>Mesh Type: (unsigned 32-bit integer)
       <dd>This value indicates whether the grid is
-        polar/spherical/cartesion,
+        polar/spherical/cartesian,
         structured/unstructured and regular/irregular. <br />
         The mesh type value is broken up as follows: <br />
 

diff --git a/doxygen/examples/H5.format.html b/doxygen/examples/H5.format.html
@@ -9123,7 +9123,7 @@ <h4><a name="DataSpaceMessage">Header Message Name: Complex Dataspace (Fiber Bun
 	  <dl>
 	    <dt>Mesh Type: (unsigned 32-bit integer)
 	      <dd>This value indicates whether the grid is
-	        polar/spherical/cartesion,
+	        polar/spherical/cartesian,
 	        structured/unstructured and regular/irregular. <br />
 	        The mesh type value is broken up as follows: <br />
 

diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
@@ -466,7 +466,7 @@ END SUBROUTINE h5pset_deflate_f
 !!
 !! \brief Retrieves the version information of various objects for a file creation property list.
 !!
-!! \param prp_id   File createion property list identifier.
+!! \param prp_id   File creation property list identifier.
 !! \param boot     Super block version number.
 !! \param freelist Global freelist version number.
 !! \param stab     Symbol table version number.

diff --git a/hl/fortran/src/H5IMff.F90 b/hl/fortran/src/H5IMff.F90
@@ -366,7 +366,7 @@ END SUBROUTINE h5imlink_palette_f
 !>
 !! \ingroup FH5IM
 !!
-!! \brief This function dettaches a palette to an existing image dataset.
+!! \brief This function detaches a palette to an existing image dataset.
 !!
 !! \param loc_id     Location identifier. The identifier may be that of a file or group.
 !! \param image_name The name of the image dataset.

diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
@@ -649,7 +649,7 @@ H5IMlink_palette(hid_t loc_id, const char *image_name, const char *pal_name)
 /*-------------------------------------------------------------------------
  * Function: H5IMunlink_palette
  *
- * Purpose: This function dettaches a palette from an existing image dataset
+ * Purpose: This function detaches a palette from an existing image dataset
  *
  * Return: Success: 0, Failure: -1
  *

diff --git a/hl/src/H5IMpublic.h b/hl/src/H5IMpublic.h
@@ -66,7 +66,7 @@ extern "C" {
  * - \ref H5IMread_image
  *   \n Reads image data from disk.
  * - \ref H5IMunlink_palette
- *   \n Dettaches a palette from an image.
+ *   \n Detaches a palette from an image.
  *
  */
 
@@ -229,15 +229,15 @@ H5_HLDLL herr_t H5IMlink_palette(hid_t loc_id, const char *image_name, const cha
  * --------------------------------------------------------------------------
  * \ingroup H5IM
  *
- * \brief Dettaches a palette from an image.
+ * \brief Detaches a palette from an image.
  *
  * \fg_loc_id
  * \param[in] image_name    The name of the image dataset
  * \param[in] pal_name      The name of the palette
  *
  * \return \herr_t
  *
- * \details H5IMunlink_palette() dettaches a palette from an image
+ * \details H5IMunlink_palette() detaches a palette from an image
  *          specified by \p image_name.
  *
  */

diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
@@ -9404,7 +9404,7 @@ public synchronized static native void H5Pset_meta_block_size(long fapl_id, long
     /**
      * @ingroup JH5P
      *
-     * H5Pset_sieve_buf_size Sets the maximum size of the data seive buffer used for file
+     * H5Pset_sieve_buf_size Sets the maximum size of the data sieve buffer used for file
      *      drivers which are capable of using data sieving.  The data sieve
      *      buffer is used when performing I/O on datasets in the file.  Using a
      *      buffer which is large anough to hold several pieces of the dataset
@@ -9418,7 +9418,7 @@ public synchronized static native void H5Pset_meta_block_size(long fapl_id, long
      * @param fapl_id
      *            IN: Identifier of property list to modify.
      * @param size
-     *            IN: maximum size of the data seive buffer.
+     *            IN: maximum size of the data sieve buffer.
      *
      * @exception HDF5LibraryException
      *            Error from the HDF5 Library.

diff --git a/release_docs/HISTORY-1_0-1_8_0.txt b/release_docs/HISTORY-1_0-1_8_0.txt
@@ -1443,7 +1443,7 @@ Known Problems
   filter script.
 
 * H5Ocopy() does not copy reg_ref attributes correctly when shared-message
-  is turn on. The value of the reference in the destination attriubte is
+  is turn on. The value of the reference in the destination attribute is
   wrong. This H5Ocopy problem will affect h5copy tool
 
 %%%%1.6.7%%%%   Release Information for hdf5-1.6.7 (31/January/08)

diff --git a/release_docs/HISTORY-1_10_0-1_12_0.txt b/release_docs/HISTORY-1_10_0-1_12_0.txt
@@ -409,7 +409,7 @@ Bug Fixes since HDF5-1.10.3 release
     - Fixed a bug caused by bad tag value when condensing object header
       messages
 
-      There was an assertion failure when moving meessages from running a
+      There was an assertion failure when moving messages from running a
       user test program with library release hdf5.1.10.4. It was because
       the tag value (object header's address) was not set up when entering
       the library routine H5O__chunk_update_idx(), which will eventually

diff --git a/release_docs/HISTORY-1_8_0-1_10_0.txt b/release_docs/HISTORY-1_8_0-1_10_0.txt
@@ -837,7 +837,7 @@ Bug Fixes since HDF5-1.8.0 release
     - Support for TFLOPS, config/intel-osf1, is removed since the TFLOPS
       machine has long retired. AKC - 2009/10/06.
     - Added $(EXEEXT) extension to H5detect when it's executed in the
-      src/Makfile to generate H5Tinit.c so it works correctly on platforms
+      src/Makefile to generate H5Tinit.c so it works correctly on platforms
       that require the full extension when running executables.
       MAM - 2009/10/01 - BZ #1613
     - Configure will now set FC and CXX to "no" when fortran and c++
@@ -1734,6 +1734,6 @@ Known Problems
   filter script.
 
 * H5Ocopy() does not copy reg_ref attributes correctly when shared-message
-  is turn on. The value of the reference in the destination attriubte is
+  is turn on. The value of the reference in the destination attribute is
   wrong. This H5Ocopy problem will affect h5copy tool
 
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
@@ -1019,7 +1019,7 @@ H5AC__log_inserted_entry(const H5AC_info_t *entry_ptr)
  *		dirty bytes count.
  *
  *		The rank 0 process then removes any references to the
- *		entry under its old address from the cleands and dirtied
+ *		entry under its old address from the cleaned and dirtied
  *		lists, and inserts an entry in the dirtied list under the
  *		new address.
  *

diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
@@ -27,7 +27,7 @@
 
 #include "H5ACpublic.h" /*public prototypes            */
 
-/* Pivate headers needed by this header */
+/* Private headers needed by this header */
 #include "H5private.h"   /* Generic Functions            */
 #include "H5Cprivate.h"  /* Cache                */
 #include "H5Fprivate.h"  /* File access                */

diff --git a/src/H5Cimage.c b/src/H5Cimage.c
@@ -443,7 +443,7 @@ H5C__generate_cache_image(H5F_t *f, H5C_t *cache_ptr)
  *              deserialized entry after it is inserted in the cache.
  *
  *              Since deserializing a prefetched entry is semantically
- *              equivalent to a load, issue an entry loaded nofification
+ *              equivalent to a load, issue an entry loaded notification
  *              if the notify callback is defined.
  *
  * Return:      SUCCEED on success, and FAIL on failure.

diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
@@ -541,7 +541,7 @@ typedef struct H5C_t H5C_t;
  *    ensure that the entry is ready to be flushed -- in particular,
  *    if the entry contains references to other entries that are in
  *    temporary file space, the pre-serialize callback must move those
- *    entries into real file space so that the serialzed entry will
+ *    entries into real file space so that the serialized entry will
  *    contain no invalid data.
  *
  *    One would think that the base address and length of

diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
@@ -1010,7 +1010,7 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
-    double             re_dub       = 0.0; /* re-usable double variable */
+    double             re_dub       = 0.0; /* reusable double variable */
     unsigned           suffix_i     = 0;
     const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 

diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
@@ -1762,7 +1762,7 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
 
         /* In principle, it is possible for the size returned by the
          * call to MPI_File_get_size() to depend on whether writes from
-         * all proceeses have completed at the time process 0 makes the
+         * all processes have completed at the time process 0 makes the
          * call.
          *
          * In practice, most (all?) truncate calls will come after a barrier

diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
@@ -184,7 +184,7 @@ typedef enum H5F_mem_t H5FD_mem_t;
 /*
  * Defining H5FD_FEAT_DATA_SIEVE for a VFL driver means that
  * the library will attempt to cache raw data as it is read from/written to
- * a file in a "data seive" buffer.  See Rajeev Thakur's papers:
+ * a file in a "data sieve" buffer.  See Rajeev Thakur's papers:
  *  http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps.gz
  *  http://www.mcs.anl.gov/~thakur/papers/mpio-high-perf.ps.gz
  */

diff --git a/src/H5FDros3.c b/src/H5FDros3.c
@@ -743,7 +743,7 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     if (fa.authenticate == TRUE) {
         /* compute signing key (part of AWS/S3 REST API)
          * can be re-used by user/key for 7 days after creation.
-         * find way to re-use/share
+         * find way to reuse/share
          */
         now = gmnow();
         HDassert(now != NULL);
@@ -865,7 +865,7 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
-    double             re_dub       = 0.0; /* re-usable double variable */
+    double             re_dub       = 0.0; /* reusable double variable */
     unsigned           suffix_i     = 0;
     const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 

diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
@@ -579,7 +579,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
  *
  *    Headers list at `first_header` is not touched.
  *
- *    - Programmer should re-use or destroy `first_header` pointer
+ *    - Programmer should reuse or destroy `first_header` pointer
  *      (hrb_node_t *) as suits their purposes.
  *    - Recommend fetching prior to destroy()
  *      e.g., `reuse_node = hrb_to_die->first_header; destroy(hrb_to_die);`
@@ -2527,7 +2527,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
  *     Create AWS4 "Signing Key" from secret key, AWS region, and timestamp.
  *
  *     Sequentially runs HMAC_SHA256 on strings in specified order,
- *     generating re-usable checksum (according to documentation, valid for
+ *     generating reusable checksum (according to documentation, valid for
  *     7 days from time given).
  *
  *     `secret` is `access key id` for targeted service/bucket/resource.

diff --git a/src/H5FDs3comms.h b/src/H5FDs3comms.h
@@ -216,7 +216,7 @@
  *
  * `magic` (unsigned long)
  *
- *     "unique" idenfier number for the structure type
+ *     "unique" identifier number for the structure type
  *
  * `name` (char *)
  *
@@ -463,7 +463,7 @@ typedef struct {
  *
  * `signing_key` (unsigned char *)
  *
- *     Pointer to `SHA256_DIGEST_LENGTH`-long string for "re-usable" signing
+ *     Pointer to `SHA256_DIGEST_LENGTH`-long string for "reusable" signing
  *     key, generated via
  *     `HMAC-SHA256(HMAC-SHA256(HMAC-SHA256(HMAC-SHA256("AWS4<secret_key>",
  *         "<yyyyMMDD"), "<aws-region>"), "<aws-service>"), "aws4_request")`

diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
@@ -206,7 +206,7 @@ typedef struct H5FL_blk_head_t {
 #define H5FL_BLK_REALLOC(t, blk, new_size)                                                                   \
     (uint8_t *)H5FL_blk_realloc(&(H5FL_BLK_NAME(t)), blk, new_size H5FL_TRACK_INFO)
 
-/* Check if there is a free block available to re-use */
+/* Check if there is a free block available to reuse */
 #define H5FL_BLK_AVAIL(t, size) H5FL_blk_free_block_avail(&(H5FL_BLK_NAME(t)), size)
 
 #else /* H5_NO_BLK_FREE_LISTS */

diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
@@ -712,7 +712,7 @@ H5_DLL herr_t H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
  *          any object identifier is open for the object, the space will not be
  *          released until after the object identifier is closed.
  *
- *          Note that space identified as freespace is available for re-use only
+ *          Note that space identified as freespace is available for reuse only
  *          as long as the file remains open; once a file has been closed, the
  *          HDF5 library loses track of freespace. See “Freespace Management” in
  *          the \ref UG for further details.

diff --git a/src/H5HFcache.c b/src/H5HFcache.c
@@ -2621,7 +2621,7 @@ H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -2986,7 +2986,7 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr, hbool_t *fd_
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -3103,7 +3103,7 @@ H5HF__cache_verify_iblock_descendants_clean(H5F_t *f, haddr_t fd_parent_addr, H5
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -3266,7 +3266,7 @@ H5HF__cache_verify_iblocks_dblocks_clean(H5F_t *f, haddr_t fd_parent_addr, H5HF_
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap

diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
@@ -192,7 +192,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
         if ((f->shared->feature_flags & aggr->feature_flag) &&
             f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && !f->shared->closing) {
 #endif
-            haddr_t    aggr_frag_addr = HADDR_UNDEF; /* Address of aggregrator fragment */
+            haddr_t    aggr_frag_addr = HADDR_UNDEF; /* Address of aggregator fragment */
             hsize_t    aggr_frag_size = 0;           /* Size of aggregator fragment */
             hsize_t    alignment;                    /* Alignment of this section */
             hsize_t    aggr_mis_align = 0;           /* Misalignment of aggregator */
@@ -483,7 +483,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
                     }     /* end else */
                 }         /* end if */
                 else {
-                    /* The aggreator is not at end of file */
+                    /* The aggregator is not at end of file */
                     /* Check if aggregator has enough internal space to satisfy the extension. */
                     if (aggr->size >= extra_requested) {
                         /* Extend block into aggregator */

diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
@@ -1848,7 +1848,7 @@ H5O__move_msgs_forward(H5F_t *f, H5O_t *oh)
                                                  null_msg->raw + null_msg->raw_size, gap_size) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert gap in chunk")
 
-                                /* Re-use message # for new null message taking place of non-null message */
+                                /* Reuse message # for new null message taking place of non-null message */
                                 new_null_msg = v;
                             } /* end if */
                             else {

diff --git a/src/H5Oefl.c b/src/H5Oefl.c
@@ -354,7 +354,7 @@ H5O__efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void
  * Function:	H5O__efl_reset
  *
  * Purpose:	Frees internal pointers and resets the message to an
- *		initialial state.
+ *		initial state.
  *
  * Return:	Non-negative on success/Negative on failure
  *

diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
@@ -2165,7 +2165,7 @@ H5Pget_meta_block_size(hid_t plist_id, hsize_t *size /*out*/)
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_sieve_buf_size
  *
- * Purpose:    Sets the maximum size of the data seive buffer used for file
+ * Purpose:    Sets the maximum size of the data sieve buffer used for file
  *      drivers which are capable of using data sieving.  The data sieve
  *      buffer is used when performing I/O on datasets in the file.  Using a
  *      buffer which is large anough to hold several pieces of the dataset

diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
@@ -1172,7 +1172,7 @@ H5T_get_actual_type(H5T_t *dt)
 /*-------------------------------------------------------------------------
  * Function:    H5T_save_refresh_state
  *
- * Purpose:     Save state for datatype reconstuction after a refresh.
+ * Purpose:     Save state for datatype reconstruction after a refresh.
  *
  * Return:      SUCCEED/FAIL
  *
@@ -1212,7 +1212,7 @@ H5T_save_refresh_state(hid_t tid, H5O_shared_t *cached_H5O_shared)
 /*-------------------------------------------------------------------------
  * Function:    H5T_restore_refresh_state
  *
- * Purpose:     Restore state for datatype reconstuction after a refresh.
+ * Purpose:     Restore state for datatype reconstruction after a refresh.
  *
  * Return:      SUCCEED/FAIL
  *