diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2019-06-26 15:47:31 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-07-22 19:52:43 (GMT) |
commit | 00a546ec57edd319d95baea088ab0f9fb7b722b5 (patch) | |
tree | c181579c0be6fa120f81671e5955b479e1a3aa7d /src/H5Oprivate.h | |
parent | f4e2304bad527b57d6edcb7136e69ac7ba70cebf (diff) | |
download | hdf5-00a546ec57edd319d95baea088ab0f9fb7b722b5.zip hdf5-00a546ec57edd319d95baea088ab0f9fb7b722b5.tar.gz hdf5-00a546ec57edd319d95baea088ab0f9fb7b722b5.tar.bz2 |
Bring pull request #1772 from develop to 1.10.
Fails file creation when non-default free-space info is set in fcpl and the library version
high bound is less than v110 because free-space info message is introduced in library release v110.
Merge pull request #1772 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-10808-h5pset_file_space_strategy-succeeds to develop
* commit '3768566139df18928aa29ece0eff3010b224633b':
Add release notes.
Correct hid_t error value to H5I_INVALID_HID in tests related to libver_bounds.
Fix for HDFFV-10808 H5Pset_file_space_strategy succeeds when using H5Pset_libver_bounds v18,v18. Fails file creation when non-default free-space info is set in fcpl and the library version high bound is less than v110 because free-space info message is introduced in library release v110.
Conflicts:
test/tfile.c
Diffstat (limited to 'src/H5Oprivate.h')
-rw-r--r-- | src/H5Oprivate.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 34683fe..955155b 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -803,6 +803,17 @@ typedef uint32_t H5O_refcount_t; /* Contains # of links to object, if >1 */ typedef unsigned H5O_unknown_t; /* Original message type ID */ +/* To indicate an invalid version for a message that does not exist yet for the release */ +/* Message version is 1 byte so the value can be 0 to 255 */ +#define H5O_INVALID_VERSION 256 + +/* The initial version of the fsinfo message: deprecated */ +/* This version is mapped to version 1 from release 1.10.1 onwards */ +#define H5O_FSINFO_VERSION_0 0 + +/* The latest version for fsinfo message */ +#define H5O_FSINFO_VERSION_1 1 +#define H5O_FSINFO_VERSION_LATEST H5O_FSINFO_VERSION_1 /* * File space info Message. * Contains file space management info and @@ -810,6 +821,7 @@ typedef unsigned H5O_unknown_t; /* Original message type ID */ * (Data structure in memory) */ typedef struct H5O_fsinfo_t { + unsigned version; /* Version number */ H5F_fspace_strategy_t strategy; /* File space strategy */ hbool_t persist; /* Persisting free-space or not */ hsize_t threshold; /* Free-space section threshold */ |