diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2022-06-24 03:16:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 03:16:21 (GMT) |
| commit | ac7bddf2af317d4bc34854f5565396da51ff12aa (patch) | |
| tree | f06f4267731f53e29da848d7d043950ec023f0b3 /src/H5FDmulti.c | |
| parent | 50b3fb09a79cf94064d09087df6c44e680adc3a8 (diff) | |
| download | hdf5-ac7bddf2af317d4bc34854f5565396da51ff12aa.zip hdf5-ac7bddf2af317d4bc34854f5565396da51ff12aa.tar.gz hdf5-ac7bddf2af317d4bc34854f5565396da51ff12aa.tar.bz2 | |
VFD SWMR: sync with develop (#1825)
* bin directory sync
* doxygen changes
* C++ sync with develop
* Fortran sync with develop
* Sync various docs with develop
* Java sync with develop
* More doxygen sync with develop
* tools sync with develop
* h5test.h testing macros get enclosed in do..while loops (#1721)
* Minor examples normalization with develop
* hl sync with develop
* sprintf to snprintf (#1815)
* Misc sync w/ develop
* Brings some selection I/O bits over from develop
* Brings over some const fixes from develop
* Brings over more const bits from develop
* Minor bits missed in early syncs
* Brings over rest of selection I/O
* Sync of mirror VFD changes w/ develop
* Committing clang-format changes
* Adds missing testpar file
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5FDmulti.c')
| -rw-r--r-- | src/H5FDmulti.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index faf4b87..2b09595 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -176,6 +176,7 @@ static herr_t H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, c /* The class struct */ static const H5FD_class_t H5FD_multi_g = { + H5FD_CLASS_VERSION, /* struct version */ H5_VFD_MULTI, /* value */ "multi", /* name */ HADDR_MAX, /* maxaddr */ @@ -204,6 +205,10 @@ static const H5FD_class_t H5FD_multi_g = { H5FD_multi_get_handle, /* get_handle */ H5FD_multi_read, /* read */ H5FD_multi_write, /* write */ + NULL, /*read_vector */ + NULL, /*write_vector */ + NULL, /* read_selection */ + NULL, /* write_selection */ H5FD_multi_flush, /* flush */ H5FD_multi_truncate, /* truncate */ H5FD_multi_lock, /* lock */ @@ -2243,9 +2248,6 @@ H5_MULTI_GCC_DIAG_ON("format-nonliteral") * * Return: Non-negative on success/Negative on failure * - * Changes: Added support for H5FD_CTL__GET_TERMINAL_VFD. - * JRM -- 5/4/22 - * *------------------------------------------------------------------------- */ static herr_t @@ -2265,7 +2267,7 @@ H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void *inpu switch (op_code) { - case H5FD_CTL__GET_TERMINAL_VFD: + case H5FD_CTL_GET_TERMINAL_VFD: /* One can argue as to whether the multi VFD should be regarded as terminal. * It is treated as such here, as it is the lowest VFD through which all I/O * request pass. @@ -2278,7 +2280,7 @@ H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void *inpu /* Unknown op code */ default: - if (flags & H5FD_CTL__FAIL_IF_UNKNOWN_FLAG) + if (flags & H5FD_CTL_FAIL_IF_UNKNOWN_FLAG) H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_FCNTL, "VFD ctl request failed (unknown op code and fail if unknown flag is set)", -1); |