Merge hdf5 1 10 8 (#1154)hdf5-1_10_8

 Merge HDF5 1.10.8 release files to 1.10/master

1 files changed, 88 insertions, 118 deletions

diff --git a/src/H5Gent.c b/src/H5Gent.c
index 632ffa0..b200c0e 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -20,41 +20,35 @@
 /* Module Setup */
 /****************/
 
-#include "H5Gmodule.h"          /* This source code file is part of the H5G module */
-
+#include "H5Gmodule.h" /* This source code file is part of the H5G module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"         /* File access				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5MMprivate.h"	/* Memory management			*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fprivate.h"  /* File access				*/
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5Gpkg.h"      /* Groups		  		*/
+#include "H5HLprivate.h" /* Local Heaps				*/
+#include "H5MMprivate.h" /* Memory management			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -62,18 +56,14 @@
 /* Declare extern the PQ free list for the wrapped strings */
 H5FL_BLK_EXTERN(str_buf);
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_decode_vec
  *
@@ -93,8 +83,8 @@ H5FL_BLK_EXTERN(str_buf);
 herr_t
 H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, const uint8_t *p_end, H5G_entry_t *ent, unsigned n)
 {
-    unsigned    u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -104,10 +94,10 @@ H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, const uint8_t *p_end, H5
     HDassert(ent);
 
     /* decode entries */
-    for(u = 0; u < n; u++) {
-        if(*pp > p_end)
+    for (u = 0; u < n; u++) {
+        if (*pp > p_end)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "ran off the end of the image buffer")
-        if(H5G_ent_decode(f, pp, ent + u) < 0)
+        if (H5G_ent_decode(f, pp, ent + u) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTDECODE, FAIL, "can't decode")
     }
 
@@ -115,7 +105,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__ent_decode_vec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_ent_decode
  *
@@ -134,9 +123,9 @@ done:
 herr_t
 H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
 {
-    const uint8_t	*p_ret = *pp;
-    uint32_t		tmp;
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    const uint8_t *p_ret = *pp;
+    uint32_t       tmp;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -153,7 +142,7 @@ H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
     ent->type = (H5G_cache_type_t)tmp;
 
     /* decode scratch-pad */
-    switch(ent->type) {
+    switch (ent->type) {
         case H5G_NOTHING_CACHED:
             break;
 
@@ -179,7 +168,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_ent_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_encode_vec
  *
@@ -199,8 +187,8 @@ done:
 herr_t
 H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsigned n)
 {
-    unsigned    u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -210,15 +198,14 @@ H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsign
     HDassert(ent);
 
     /* encode entries */
-    for(u = 0; u < n; u++)
-        if(H5G_ent_encode(f, pp, ent + u) < 0)
+    for (u = 0; u < n; u++)
+        if (H5G_ent_encode(f, pp, ent + u) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't encode")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5G__ent_encode_vec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G_ent_encode
  *
@@ -238,8 +225,8 @@ done:
 herr_t
 H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
 {
-    uint8_t	*p_ret = *pp + H5G_SIZEOF_ENTRY_FILE(f);
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    uint8_t *p_ret     = *pp + H5G_SIZEOF_ENTRY_FILE(f);
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -248,15 +235,15 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
     HDassert(pp);
 
     /* Check for actual entry to encode */
-    if(ent) {
+    if (ent) {
         /* encode header */
         H5F_ENCODE_LENGTH(f, *pp, ent->name_off);
         H5F_addr_encode(f, pp, ent->header);
         UINT32ENCODE(*pp, ent->type);
-	UINT32ENCODE(*pp, 0); /*reserved*/
+        UINT32ENCODE(*pp, 0); /*reserved*/
 
         /* encode scratch-pad */
-        switch(ent->type) {
+        switch (ent->type) {
             case H5G_NOTHING_CACHED:
                 break;
 
@@ -275,16 +262,16 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
             default:
                 HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unknown symbol table entry cache type")
         } /* end switch */
-    } /* end if */
+    }     /* end if */
     else {
         H5F_ENCODE_LENGTH(f, *pp, 0);
         H5F_addr_encode(f, pp, HADDR_UNDEF);
         UINT32ENCODE(*pp, H5G_NOTHING_CACHED);
-	UINT32ENCODE(*pp, 0); /*reserved*/
-    } /* end else */
+        UINT32ENCODE(*pp, 0); /*reserved*/
+    }                         /* end else */
 
     /* fill with zero */
-    if(*pp < p_ret)
+    if (*pp < p_ret)
         HDmemset(*pp, 0, (size_t)(p_ret - *pp));
     *pp = p_ret;
 
@@ -292,7 +279,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_ent_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_copy
  *
@@ -330,10 +316,11 @@ H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
     H5MM_memcpy(dst, src, sizeof(H5G_entry_t));
 
     /* Deep copy the names */
-    if(depth == H5_COPY_DEEP) {
+    if (depth == H5_COPY_DEEP) {
         /* Nothing currently */
         ;
-    } else if(depth == H5_COPY_SHALLOW) {
+    }
+    else if (depth == H5_COPY_SHALLOW) {
         /* Discarding 'const' qualifier OK - QAK */
         H5G__ent_reset((H5G_entry_t *)src);
     } /* end if */
@@ -341,7 +328,6 @@ H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5G__ent_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5G__ent_reset
  *
@@ -370,7 +356,6 @@ H5G__ent_reset(H5G_entry_t *ent)
     FUNC_LEAVE_NOAPI_VOID
 } /* end H5G__ent_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_convert
  *
@@ -385,11 +370,11 @@ H5G__ent_reset(H5G_entry_t *ent)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__ent_convert(H5F_t *f, H5HL_t *heap, const char *name, const H5O_link_t *lnk,
-    H5O_type_t obj_type, const void *crt_info, H5G_entry_t *ent)
+H5G__ent_convert(H5F_t *f, H5HL_t *heap, const char *name, const H5O_link_t *lnk, H5O_type_t obj_type,
+                 const void *crt_info, H5G_entry_t *ent)
 {
-    size_t	name_offset;            /* Offset of name in heap */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    size_t name_offset;         /* Offset of name in heap */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -402,86 +387,83 @@ H5G__ent_convert(H5F_t *f, H5HL_t *heap, const char *name, const H5O_link_t *lnk
     /* Reset the new entry */
     H5G__ent_reset(ent);
 
-    /*
-     * Add the new name to the heap.
-     */
-    name_offset = H5HL_insert(f, heap, HDstrlen(name) + 1, name);
-    if(0 == name_offset || UFAIL == name_offset)
+    /* Add the new name to the heap */
+    if (H5HL_insert(f, heap, HDstrlen(name) + 1, name, &name_offset) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert symbol name into heap")
     ent->name_off = name_offset;
 
     /* Build correct information for symbol table entry based on link type */
-    switch(lnk->type) {
+    switch (lnk->type) {
         case H5L_TYPE_HARD:
-            if(obj_type == H5O_TYPE_GROUP) {
+            if (obj_type == H5O_TYPE_GROUP) {
                 const H5G_obj_create_t *gcrt_info = (const H5G_obj_create_t *)crt_info;
 
                 ent->type = gcrt_info->cache_type;
-                if(ent->type != H5G_NOTHING_CACHED)
+                if (ent->type != H5G_NOTHING_CACHED)
                     ent->cache = gcrt_info->cache;
 #ifndef NDEBUG
                 else {
                     /* Make sure there is no stab message in the target object
                      */
-                    H5O_loc_t   targ_oloc;      /* Location of link target */
-                    htri_t      stab_exists;    /* Whether the target symbol table exists */
+                    H5O_loc_t targ_oloc;   /* Location of link target */
+                    htri_t    stab_exists; /* Whether the target symbol table exists */
 
                     /* Build target object location */
-                    if(H5O_loc_reset(&targ_oloc) < 0)
+                    if (H5O_loc_reset(&targ_oloc) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize target location")
                     targ_oloc.file = f;
                     targ_oloc.addr = lnk->u.hard.addr;
 
                     /* Check if a symbol table message exists */
-                    if((stab_exists = H5O_msg_exists(&targ_oloc, H5O_STAB_ID)) < 0)
+                    if ((stab_exists = H5O_msg_exists(&targ_oloc, H5O_STAB_ID)) < 0)
                         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to check for STAB message")
 
                     HDassert(!stab_exists);
                 } /* end else */
-#endif /* NDEBUG */
-            } /* end if */
-            else if(obj_type == H5O_TYPE_UNKNOWN){
+#endif            /* NDEBUG */
+            }     /* end if */
+            else if (obj_type == H5O_TYPE_UNKNOWN) {
                 /* Try to retrieve symbol table information for caching */
-                H5O_loc_t       targ_oloc;      /* Location of link target */
-                H5O_t           *oh;            /* Link target object header */
-                H5O_stab_t      stab;           /* Link target symbol table */
-                htri_t          stab_exists;    /* Whether the target symbol table exists */
+                H5O_loc_t  targ_oloc;   /* Location of link target */
+                H5O_t *    oh;          /* Link target object header */
+                H5O_stab_t stab;        /* Link target symbol table */
+                htri_t     stab_exists; /* Whether the target symbol table exists */
 
                 /* Build target object location */
-                if(H5O_loc_reset(&targ_oloc) < 0)
+                if (H5O_loc_reset(&targ_oloc) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "unable to initialize target location")
                 targ_oloc.file = f;
                 targ_oloc.addr = lnk->u.hard.addr;
 
                 /* Get the object header */
-                if(NULL == (oh = H5O_protect(&targ_oloc, H5AC__READ_ONLY_FLAG, FALSE)))
+                if (NULL == (oh = H5O_protect(&targ_oloc, H5AC__READ_ONLY_FLAG, FALSE)))
                     HGOTO_ERROR(H5E_SYM, H5E_CANTPROTECT, FAIL, "unable to protect target object header")
 
                 /* Check if a symbol table message exists */
-                if((stab_exists = H5O_msg_exists_oh(oh, H5O_STAB_ID)) < 0) {
-                    if(H5O_unprotect(&targ_oloc, oh, H5AC__NO_FLAGS_SET) < 0)
+                if ((stab_exists = H5O_msg_exists_oh(oh, H5O_STAB_ID)) < 0) {
+                    if (H5O_unprotect(&targ_oloc, oh, H5AC__NO_FLAGS_SET) < 0)
                         HERROR(H5E_SYM, H5E_CANTUNPROTECT, "unable to release object header");
                     HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to check for STAB message")
                 } /* end if */
 
-                if(stab_exists) {
+                if (stab_exists) {
                     /* Read symbol table message */
-                    if(NULL == H5O_msg_read_oh(f, oh, H5O_STAB_ID, &stab)) {
-                        if(H5O_unprotect(&targ_oloc, oh, H5AC__NO_FLAGS_SET) < 0)
+                    if (NULL == H5O_msg_read_oh(f, oh, H5O_STAB_ID, &stab)) {
+                        if (H5O_unprotect(&targ_oloc, oh, H5AC__NO_FLAGS_SET) < 0)
                             HERROR(H5E_SYM, H5E_CANTUNPROTECT, "unable to release object header");
                         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read STAB message")
                     } /* end if */
 
                     /* Cache symbol table message */
-                    ent->type = H5G_CACHED_STAB;
+                    ent->type                  = H5G_CACHED_STAB;
                     ent->cache.stab.btree_addr = stab.btree_addr;
-                    ent->cache.stab.heap_addr = stab.heap_addr;
+                    ent->cache.stab.heap_addr  = stab.heap_addr;
                 } /* end if */
                 else
                     /* No symbol table message, don't cache anything */
                     ent->type = H5G_NOTHING_CACHED;
 
-                if(H5O_unprotect(&targ_oloc, oh, H5AC__NO_FLAGS_SET) < 0)
+                if (H5O_unprotect(&targ_oloc, oh, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
             } /* end else */
             else
@@ -490,32 +472,28 @@ H5G__ent_convert(H5F_t *f, H5HL_t *heap, const char *name, const H5O_link_t *lnk
             ent->header = lnk->u.hard.addr;
             break;
 
-        case H5L_TYPE_SOFT:
-            {
-                size_t	lnk_offset;		/* Offset to sym-link value	*/
+        case H5L_TYPE_SOFT: {
+            size_t lnk_offset; /* Offset to sym-link value	*/
 
-                /* Insert link value into local heap */
-                if(UFAIL == (lnk_offset = H5HL_insert(f, heap,
-                        HDstrlen(lnk->u.soft.name) + 1, lnk->u.soft.name)))
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to write link value to local heap")
+            /* Insert link value into local heap */
+            if (H5HL_insert(f, heap, HDstrlen(lnk->u.soft.name) + 1, lnk->u.soft.name, &lnk_offset) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to write link value to local heap")
 
-                ent->type = H5G_CACHED_SLINK;
-                ent->cache.slink.lval_offset = lnk_offset;
-            } /* end case */
-            break;
+            ent->type                    = H5G_CACHED_SLINK;
+            ent->cache.slink.lval_offset = lnk_offset;
+        } break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_EXTERNAL:
         case H5L_TYPE_MAX:
         default:
-          HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
+            HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
     } /* end switch */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__ent_convert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5G__ent_debug
  *
@@ -529,10 +507,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
-    const H5HL_t *heap)
+H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth, const H5HL_t *heap)
 {
-    const char  *lval = NULL;
+    const char *lval = NULL;
     int         nested_indent, nested_fwidth;
 
     FUNC_ENTER_PACKAGE_NOERR
@@ -542,15 +519,12 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
     nested_fwidth = MAX(0, fwidth - 3);
 
     HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-              "Name offset into private heap:",
-	          (unsigned long) (ent->name_off));
+              "Name offset into private heap:", (unsigned long)(ent->name_off));
 
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
-              "Object header address:", ent->header);
+    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Object header address:", ent->header);
 
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth,
-              "Cache info type:");
-    switch(ent->type) {
+    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Cache info type:");
+    switch (ent->type) {
         case H5G_NOTHING_CACHED:
             HDfprintf(stream, "Nothing Cached\n");
             break;
@@ -558,30 +532,27 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
         case H5G_CACHED_STAB:
             HDfprintf(stream, "Symbol Table\n");
 
-            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
-                      "Cached entry information:");
-            HDfprintf(stream, "%*s%-*s %a\n", nested_indent, "", nested_fwidth,
+            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached entry information:");
+            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", nested_indent, "", nested_fwidth,
                       "B-tree address:", ent->cache.stab.btree_addr);
 
-            HDfprintf(stream, "%*s%-*s %a\n", nested_indent, "", nested_fwidth,
+            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", nested_indent, "", nested_fwidth,
                       "Heap address:", ent->cache.stab.heap_addr);
             break;
 
         case H5G_CACHED_SLINK:
             HDfprintf(stream, "Symbolic Link\n");
-            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
-                      "Cached information:");
+            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached information:");
             HDfprintf(stream, "%*s%-*s %lu\n", nested_indent, "", nested_fwidth,
-                      "Link value offset:",
-                      (unsigned long)(ent->cache.slink.lval_offset));
-            if(heap) {
+                      "Link value offset:", (unsigned long)(ent->cache.slink.lval_offset));
+            if (heap) {
                 lval = (const char *)H5HL_offset_into(heap, ent->cache.slink.lval_offset);
                 HDfprintf(stream, "%*s%-*s %s\n", nested_indent, "", nested_fwidth,
-                          "Link value:",
-                          (lval == NULL) ? "" : lval);
+                          "Link value:", (lval == NULL) ? "" : lval);
             } /* end if */
             else
-                HDfprintf(stream, "%*s%-*s\n", nested_indent, "", nested_fwidth, "Warning: Invalid heap address given, name not displayed!");
+                HDfprintf(stream, "%*s%-*s\n", nested_indent, "", nested_fwidth,
+                          "Warning: Invalid heap address given, name not displayed!");
             break;
 
         case H5G_CACHED_ERROR:
@@ -593,4 +564,3 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G__ent_debug() */
-