Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '048ae59d2970dd21810577c999f756c028b6faaf':
  Correct errors with non-"instrumented library" builds (production & parallel, generally speaking).
  Update java error stack tests
  Revert using H5MF_sect_small_can_shrink and H5MF_sect_small_shrink for the file's free space manager (and add a comment about them).
  Add comment for the file flush when the file low / high bounds are changed after a file is open.
  Expanded comments abuot H5CX_t fields.
  Add an assert to verify that we don't write when between MPI_Barrier() calls during a flush.
  Add comments for internal structs.
  Remove redundant 'is_collective' parameter from H5CX_set_loc.
  Correct typo in comment.
  Revert some tangential code cleanups.
  Add API context source files to CMake configuration file.
  Corrections for parallel I/O & tests.
  Update handling of reporting for breaking collective I/O when the default DXPL is used.
  Update encoded DXPLs to reflect changes in properties.
  Correct typo for error checking malloc return value.
  Refactor H5CX code to reduce duplication.
  Cleanup API context function usage.
  Add API context interface and use it throughout the library.

1 files changed, 10 insertions, 16 deletions

diff --git a/src/H5Gent.c b/src/H5Gent.c
index 6e076ae..baee35c 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -390,9 +390,8 @@ H5G__ent_reset(H5G_entry_t *ent)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__ent_convert(H5F_t *f, hid_t dxpl_id, 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 */
@@ -411,7 +410,7 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
     /*
      * Add the new name to the heap.
      */
-    name_offset = H5HL_insert(f, dxpl_id, heap, HDstrlen(name) + 1, name);
+    name_offset = H5HL_insert(f, heap, HDstrlen(name) + 1, name);
     if(0 == name_offset || UFAIL == name_offset)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert symbol name into heap")
     ent->name_off = name_offset;
@@ -439,8 +438,7 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
                     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,
-                            dxpl_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);
@@ -461,23 +459,20 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
                 targ_oloc.addr = lnk->u.hard.addr;
 
                 /* Get the object header */
-                if(NULL == (oh = H5O_protect(&targ_oloc, dxpl_id, 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, dxpl_id, oh, H5AC__NO_FLAGS_SET)
-                            < 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) {
                     /* Read symbol table message */
-                    if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_STAB_ID,
-                            &stab)) {
-                        if(H5O_unprotect(&targ_oloc, dxpl_id, 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 */
@@ -491,8 +486,7 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
                     /* No symbol table message, don't cache anything */
                     ent->type = H5G_NOTHING_CACHED;
 
-                if(H5O_unprotect(&targ_oloc, dxpl_id, 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
@@ -506,7 +500,7 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
                 size_t	lnk_offset;		/* Offset to sym-link value	*/
 
                 /* Insert link value into local heap */
-                if(UFAIL == (lnk_offset = H5HL_insert(f, dxpl_id, 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")