From 96e0908f00a667e4e5dce80ae631ae36267c731c Mon Sep 17 00:00:00 2001 From: Matthew Larson Date: Fri, 1 Sep 2023 15:30:50 -0500 Subject: [PATCH] Revert accessible check to use VOL file open --- src/rest_vol_file.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/rest_vol_file.c b/src/rest_vol_file.c index d5f17cd2..4b8a0e2a 100644 --- a/src/rest_vol_file.c +++ b/src/rest_vol_file.c @@ -576,7 +576,6 @@ RV_file_specific(void *obj, H5VL_file_specific_args_t *args, hid_t dxpl_id, void char *host_header = NULL; size_t host_header_len; size_t name_length; - hid_t file_id = H5I_INVALID_HID; #ifdef RV_CONNECTOR_DEBUG printf("-> Received file-specific call with following parameters:\n"); @@ -613,23 +612,23 @@ RV_file_specific(void *obj, H5VL_file_specific_args_t *args, hid_t dxpl_id, void hbool_t *ret_is_accessible = args->args.is_accessible.accessible; const char *filename = args->args.is_accessible.filename; hid_t fapl_id = args->args.is_accessible.fapl_id; - + void *ret_file = NULL; /* Initialize in case of failure */ + *ret_is_accessible = FALSE; H5E_BEGIN_TRY { - file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id); + ret_file = RV_file_open(filename, 0, fapl_id, dxpl_id, NULL); } H5E_END_TRY; - if (file_id > 0) { + if (ret_file != NULL) { *ret_is_accessible = TRUE; - if (H5Fclose(file_id) < 0) + if (RV_file_close(ret_file, dxpl_id, NULL) < 0) FUNC_GOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close accessible file"); - file_id = H5I_INVALID_HID; } break; @@ -686,10 +685,6 @@ RV_file_specific(void *obj, H5VL_file_specific_args_t *args, hid_t dxpl_id, void curl_headers = NULL; } /* end if */ - if (file_id != H5I_INVALID_HID) - if (H5Fclose(file_id) < 0) - FUNC_GOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close file"); - /* Restore CUSTOMREQUEST to internal default */ if (CURLE_OK != curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL)) FUNC_GOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "can't set up cURL to make HTTP DELETE request: %s",