diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-03-17 02:58:38 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-03-17 02:58:38 (GMT) |
| commit | f0d22e54c705285b10f8192be6b26ba1a7ae3fbc (patch) | |
| tree | 8ad7066b9cc25f160c910955555492640a9bc9ba /src/H5HF.c | |
| parent | d2591ce377bb027d210a100c5a738e3cdd82378e (diff) | |
| parent | 5c80d3d91284bdcd048d9325b1a601d0ddfca8bd (diff) | |
| download | hdf5-f0d22e54c705285b10f8192be6b26ba1a7ae3fbc.zip hdf5-f0d22e54c705285b10f8192be6b26ba1a7ae3fbc.tar.gz hdf5-f0d22e54c705285b10f8192be6b26ba1a7ae3fbc.tar.bz2 | |
Merge pull request #1604 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '5c80d3d91284bdcd048d9325b1a601d0ddfca8bd':
- 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.
Diffstat (limited to 'src/H5HF.c')
| -rw-r--r-- | src/H5HF.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -42,6 +42,8 @@ #include "H5FOprivate.h" /* File objects */ #include "H5HFpkg.h" /* Fractal heaps */ #include "H5MFprivate.h" /* File memory management */ +#include "H5MMprivate.h" /* Memory management */ + /****************/ /* Local Macros */ @@ -104,7 +106,7 @@ H5HF_op_read(const void *obj, size_t obj_len, void *op_data) FUNC_ENTER_NOAPI_NOINIT_NOERR /* Perform "read", using memcpy() */ - HDmemcpy(op_data, obj, obj_len); + H5MM_memcpy(op_data, obj, obj_len); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5HF_op_read() */ @@ -129,7 +131,7 @@ H5HF_op_write(const void *obj, size_t obj_len, void *op_data) FUNC_ENTER_NOAPI_NOINIT_NOERR /* Perform "write", using memcpy() */ - HDmemcpy((void *)obj, op_data, obj_len); /* Casting away const OK -QAK */ + H5MM_memcpy((void *)obj, op_data, obj_len); /* Casting away const OK -QAK */ FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5HF_op_write() */ |