diff options
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/h5tools.c | 24 | ||||
-rw-r--r-- | tools/lib/h5tools.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 72f0dac..2f641d0 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -531,9 +531,9 @@ h5tools_set_vfd_fapl(hid_t fapl, h5tools_fapl_info_t *fapl_info) } else if (!HDstrcmp(fapl_info->u.name, drivernames[ROS3_VFD_IDX])) { #ifdef H5_HAVE_ROS3_VFD - if (!fapl_info->info) + if (!fapl_info->info_string) H5TOOLS_GOTO_ERROR(FAIL, "Read-only S3 VFD info is invalid"); - if (H5Pset_fapl_ros3(fapl, (H5FD_ros3_fapl_t *)fapl_info->info) < 0) + if (H5Pset_fapl_ros3(fapl, (H5FD_ros3_fapl_t *)fapl_info->info_string) < 0) H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_ros3() failed"); #else H5TOOLS_GOTO_ERROR(FAIL, "Read-only S3 VFD is not enabled"); @@ -541,9 +541,9 @@ h5tools_set_vfd_fapl(hid_t fapl, h5tools_fapl_info_t *fapl_info) } else if (!HDstrcmp(fapl_info->u.name, drivernames[HDFS_VFD_IDX])) { #ifdef H5_HAVE_LIBHDFS - if (!fapl_info->info) + if (!fapl_info->info_string) H5TOOLS_GOTO_ERROR(FAIL, "HDFS VFD info is invalid"); - if (H5Pset_fapl_hdfs(fapl, (H5FD_hdfs_fapl_t *)fapl_info->info) < 0) + if (H5Pset_fapl_hdfs(fapl, (H5FD_hdfs_fapl_t *)fapl_info->info_string) < 0) H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_hdfs() failed"); #else H5TOOLS_GOTO_ERROR(FAIL, "The HDFS VFD is not enabled"); @@ -555,7 +555,7 @@ h5tools_set_vfd_fapl(hid_t fapl, h5tools_fapl_info_t *fapl_info) break; case VOL_BY_NAME: - case VOL_BY_ID: + case VOL_BY_VALUE: default: H5TOOLS_GOTO_ERROR(FAIL, "invalid VFD retrieval type"); } @@ -612,24 +612,24 @@ h5tools_set_vol_fapl(hid_t fapl_id, h5tools_fapl_info_t *fapl_info) break; - case VOL_BY_ID: + case VOL_BY_VALUE: /* Retrieve VOL connector by ID */ - if ((connector_is_registered = H5VLis_connector_registered_by_value((H5VL_class_value_t) fapl_info->u.id)) < 0) + if ((connector_is_registered = H5VLis_connector_registered_by_value(fapl_info->u.value)) < 0) H5TOOLS_GOTO_ERROR(FAIL, "can't check if VOL connector is registered"); if (connector_is_registered) { - if ((connector_id = H5VLget_connector_id_by_value((H5VL_class_value_t) fapl_info->u.id)) < 0) + if ((connector_id = H5VLget_connector_id_by_value(fapl_info->u.value)) < 0) H5TOOLS_GOTO_ERROR(FAIL, "can't get VOL connector ID"); } else { /* Check for VOL connectors that ship with the library */ - if (fapl_info->u.id == H5VL_NATIVE_VALUE) { + if (fapl_info->u.value == H5VL_NATIVE_VALUE) { connector_id = H5VL_NATIVE; } - else if (fapl_info->u.id == H5VL_PASSTHRU_VALUE) { + else if (fapl_info->u.value == H5VL_PASSTHRU_VALUE) { connector_id = H5VL_PASSTHRU; } else { - if ((connector_id = H5VLregister_connector_by_value((H5VL_class_value_t) fapl_info->u.id, H5P_DEFAULT)) < 0) + if ((connector_id = H5VLregister_connector_by_value(fapl_info->u.value, H5P_DEFAULT)) < 0) H5TOOLS_GOTO_ERROR(FAIL, "can't register VOL connector"); } } @@ -698,7 +698,7 @@ h5tools_get_fapl(hid_t prev_fapl_id, h5tools_fapl_info_t *fapl_info) if (h5tools_set_vfd_fapl(new_fapl_id, fapl_info) < 0) H5TOOLS_GOTO_ERROR(H5I_INVALID_HID, "failed to set VFD on FAPL"); } - else if (VOL_BY_NAME == fapl_info->type || VOL_BY_ID == fapl_info->type) { + else if (VOL_BY_NAME == fapl_info->type || VOL_BY_VALUE == fapl_info->type) { if (h5tools_set_vol_fapl(new_fapl_id, fapl_info) < 0) H5TOOLS_GOTO_ERROR(H5I_INVALID_HID, "failed to set VOL on FAPL"); } diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index fd09a14..b931dc8 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -542,7 +542,7 @@ typedef struct h5tools_context_t { typedef enum { VFD_BY_NAME, VOL_BY_NAME, - VOL_BY_ID + VOL_BY_VALUE } h5tools_fapl_info_type_t; typedef struct h5tools_fapl_info_t { @@ -553,8 +553,8 @@ typedef struct h5tools_fapl_info_t { /* Field specifying either the driver's/connector's name or ID */ union { - const char *name; - long id; + const char *name; /* VOL and VFD */ + H5VL_class_value_t value; /* VOL only */ } u; } h5tools_fapl_info_t; |