Merge pull request #6 in ~VCHOI/my_third_fork from develop to bugfix/new_shutdown_fsm

* commit 'ca1ee7fae118c8d4137b1b5efe57660d2e0ff9b1': (64 commits)
  Fix memory leak in objcopy test after H5Aread of vlen data
  HDFFV-10616 add h5fc script
  Fixed a problem in the ohdr test where hard-coded strings passed to H5Awrite() triggered -fsanitize failures.
  Yanked qsort assert
  Switched to HGOTO_DONE() in the links code.
  Updated the HDqsort() macro to ensure we don't pass NULL buffers to qsort(3) in the future.
  Fixed a bug in the links code where iterating over an empty group would pass a NULL pointer to qsort(3), which is undefined behavior.
  Reset the other convenience pointer because why no
  Fixed a memory bug where a pointer is used after it's been freed.
  fixed pass_through vol
  HDFFV-10805 Add option to only build shared targets
  Fixed a warning in H5CX.c concerning incorrect use of freeing VOL connector info.
  Add H5S_SEL_ITER_SHARE_WITH_DATASPACE selection iterator creation flag, to share dataspace's selection with iterator (and with caution about not modifying or closing the dataspace while the iterator is open).
  Added a warning summary script for gcc to bin
  Fix misc. typos, etc. from code review
  Fixed problem with H5Fdelete "test" and split VFD.
  New hyperslab selection routines and new public selection iterator routines.
  Added the creation and use of an attribute access property list to testhdf5.
  Update MANIFEST for move of h5cc.in and h5redeploy.in to bin directory.
  Added missing DELETE enum value.
  ...

1 files changed, 2 insertions, 11 deletions

diff --git a/src/H5CX.c b/src/H5CX.c
index 5474b63..22ed893 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -982,18 +982,9 @@ H5CX_free_state(H5CX_state_t *api_state)
     /* Release the VOL connector property, if it was set */
     if(api_state->vol_connector_prop.connector_id) {
         /* Clean up any VOL connector info */
-        if(api_state->vol_connector_prop.connector_info) {
-            H5VL_class_t *connector;       /* Pointer to connector */
-
-            /* Retrieve the connector for the ID */
-            if(NULL == (connector = (H5VL_class_t *)H5I_object(api_state->vol_connector_prop.connector_id)))
-                HGOTO_ERROR(H5E_CONTEXT, H5E_BADTYPE, FAIL, "not a VOL connector ID")
-
-            /* Free the connector info */
-            if(H5VL_free_connector_info(connector, api_state->vol_connector_prop.connector_info) < 0)
+        if(api_state->vol_connector_prop.connector_info)
+            if(H5VL_free_connector_info(api_state->vol_connector_prop.connector_id, api_state->vol_connector_prop.connector_info) < 0)
                 HGOTO_ERROR(H5E_CONTEXT, H5E_CANTRELEASE, FAIL, "unable to release VOL connector info object")
-        } /* end if */
-
         /* Decrement connector ID */
         if(H5I_dec_ref(api_state->vol_connector_prop.connector_id) < 0)
             HDONE_ERROR(H5E_CONTEXT, H5E_CANTDEC, FAIL, "can't close VOL connector ID")