diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-03-31 01:31:11 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-03-31 01:31:11 (GMT) |
| commit | 6e0d81dc8b65dc078fa31dae50acf96f3ce372e7 (patch) | |
| tree | 588378063a4eae446ffe0c7e684f4e3aff6af358 /src/H5B2cache.c | |
| parent | fdbbe61bcf2c5bcbea8a4e08bd6ce8c62f7b43bc (diff) | |
| parent | 799a732650735b8ad05a0398781d2a26ec47b288 (diff) | |
| download | hdf5-6e0d81dc8b65dc078fa31dae50acf96f3ce372e7.zip hdf5-6e0d81dc8b65dc078fa31dae50acf96f3ce372e7.tar.gz hdf5-6e0d81dc8b65dc078fa31dae50acf96f3ce372e7.tar.bz2 | |
Merge pull request #1629 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:feature/json_vol to feature/json_vol
* commit '799a732650735b8ad05a0398781d2a26ec47b288': (185 commits)
Updated the VOL struct. The json_vol test fails, though, because the plugin can't be found. Will diagnose later.
Correct examples for packaging
HDFFV-10738 Wrong INTENT for H5LTread_dataset_double_f
Changes that show the right way to iterate over enums.
Changes that show the right way to iterate over enums.
Test improvement Description Moved the new tests to a more appropriate test function. Platforms tested: Linux/64 (jelly)
Used the H5_INC_ENUM macro to squash enum value increment warnings.
Fixed HDFFV-10210 and HDFFV-10587 Description: - Added parameter validation (HDFFV-10210) - Added detection of division by zero (HDFFV-10587 - CVE-2018-17438) - Fixed typos in various tests Platforms tested: Linux/64 (jelly) Linux/64 (platypus) Darwin (osx1011test)
Fix CMake error in name
Commented out memcpy overlap check while we investigate parallel filters issues.
Yanked check for memcpy n > 0
- Added H5MMprivate.h #includes where needed - Added casts to quiet H5MM_memcpy warnings - Removed char * casts from HDmemcpy
Added an H5MM_memcpy call that checks for buffer overlap.
Added the HDopen work-around on windows to pio_engine.c
Adds _wopen support on Windows so that files with UTF-8 names can be opened.
CMake: fix pthread linking to only be private
Add API routines to retrieve, restore, reset, and free library state.
Added a note of bug fix for HDFFV-10705.
Fixed the MANIFEST
Fix issue with direct chunk write not updating the "last chunk" index cache. Fix issues involving datasets being "no allocated" when they contain cached raw data.
...
Diffstat (limited to 'src/H5B2cache.c')
| -rw-r--r-- | src/H5B2cache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 2e1d37b..2a77bd5 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -391,7 +391,7 @@ H5B2__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le HDassert(hdr); /* Magic number */ - HDmemcpy(image, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC); + H5MM_memcpy(image, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC); image += H5_SIZEOF_MAGIC; /* Version # */ @@ -811,7 +811,7 @@ H5B2__cache_int_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le HDassert(internal->hdr); /* Magic number */ - HDmemcpy(image, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC); + H5MM_memcpy(image, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC); image += H5_SIZEOF_MAGIC; /* Version # */ @@ -1212,7 +1212,7 @@ H5B2__cache_leaf_serialize(const H5F_t H5_ATTR_UNUSED *f, void *_image, size_t H HDassert(leaf->hdr); /* magic number */ - HDmemcpy(image, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC); + H5MM_memcpy(image, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC); image += H5_SIZEOF_MAGIC; /* version # */ |