mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-07 16:37:56 +08:00
Merge pull request #1744 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5CX_warning to develop
* commit '579793a7acebcb22d1adc2421a6c1b99618f3ee9': Fixed a warning in H5CX.c concerning incorrect use of freeing VOL connector info.
This commit is contained in:
commit
712a2a13d8
13
src/H5CX.c
13
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")
|
||||
|
Loading…
Reference in New Issue
Block a user