diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2018-11-28 23:38:03 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2018-11-28 23:38:03 (GMT) |
| commit | 6eabeabdaa77642fd4db5fd234ccc756a24125be (patch) | |
| tree | b7c2fb4bee8782df27f18efbcb1f11d6847e1fde /src/H5VLpassthru.c | |
| parent | 3abf58dce034dd9e5afabbdd7d1d80c1ba4374ad (diff) | |
| download | hdf5-6eabeabdaa77642fd4db5fd234ccc756a24125be.zip hdf5-6eabeabdaa77642fd4db5fd234ccc756a24125be.tar.gz hdf5-6eabeabdaa77642fd4db5fd234ccc756a24125be.tar.bz2 | |
Refactor infrastructure for setting FAPL information from environment
variables during testing, including connecting native, pass-through, and
dynamically loaded VOL connectors. Also bring native and pass-through
VOL connectors into alignment, removing the "H5VLnative_private.h" header.
Diffstat (limited to 'src/H5VLpassthru.c')
| -rw-r--r-- | src/H5VLpassthru.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c index 3181834..f8568de 100644 --- a/src/H5VLpassthru.c +++ b/src/H5VLpassthru.c @@ -237,7 +237,7 @@ static const H5VL_class_t H5VL_pass_through_g = { }; /* The connector identification number, initialized at runtime */ -static hid_t H5VL_PASSTHRU_g = 0; +static hid_t H5VL_PASSTHRU_g = H5I_INVALID_HID; /*------------------------------------------------------------------------- @@ -315,7 +315,7 @@ H5VL_pass_through_term(void) #endif /* Reset VOL ID */ - H5VL_PASSTHRU_g = 0; + H5VL_PASSTHRU_g = H5I_INVALID_HID; return(0); } /* end H5VL_pass_through_term() */ @@ -462,7 +462,7 @@ H5VL_pass_through_info_to_str(const void *_info, char **str) assert(*str); /* Encode our info */ - snprintf(*str, 32 + under_vol_str_len, "under_val=%u, under_info={%s}", (unsigned)under_value, (under_vol_string ? under_vol_string : "")); + snprintf(*str, 32 + under_vol_str_len, "under_val=%u;under_info={%s}", (unsigned)under_value, (under_vol_string ? under_vol_string : "")); return(0); } /* end H5VL_pass_through_info_to_str() */ @@ -492,7 +492,7 @@ H5VL_pass_through_str_to_info(const char *str, void **_info) #endif /* Retrieve the underlying VOL connector value and info */ - sscanf(str, "under_vol=%u,", &under_vol_value); + sscanf(str, "under_vol=%u;", &under_vol_value); under_vol_id = H5VLregister_connector_by_value((H5VL_class_value_t)under_vol_value, H5P_DEFAULT); under_vol_info_start = strchr(str, '{'); under_vol_info_end = strrchr(str, '}'); |