diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-05-15 15:57:50 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-05-15 15:57:50 (GMT) |
| commit | 7f7fbeda1380845a2ff2424ddefa6de481f6fad9 (patch) | |
| tree | 8de847542c4c0f2f86981db312a4f8ee4ac1f5ee /src/H5Odtype.c | |
| parent | 758846065953f93503394e1549bf4f3a8f07ab0e (diff) | |
| parent | c30cf6d59664f63573b31efa4e73b41de168e381 (diff) | |
| download | hdf5-7f7fbeda1380845a2ff2424ddefa6de481f6fad9.zip hdf5-7f7fbeda1380845a2ff2424ddefa6de481f6fad9.tar.gz hdf5-7f7fbeda1380845a2ff2424ddefa6de481f6fad9.tar.bz2 | |
Merge pull request #2581 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10_warnings to hdf5_1_10
* commit 'c30cf6d59664f63573b31efa4e73b41de168e381':
Moved H5MM_memcpy and H5MM_xfree_const from develop
Diffstat (limited to 'src/H5Odtype.c')
| -rw-r--r-- | src/H5Odtype.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Odtype.c b/src/H5Odtype.c index 4cf5067..a349cc5 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -250,7 +250,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p HDassert(0 == (z & 0x7)); /*must be aligned*/ if(NULL == (dt->shared->u.opaque.tag = (char *)H5MM_malloc(z + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") - HDmemcpy(dt->shared->u.opaque.tag, *pp, z); + H5MM_memcpy(dt->shared->u.opaque.tag, *pp, z); dt->shared->u.opaque.tag[z] = '\0'; *pp += z; break; @@ -483,7 +483,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p } /* end for */ /* Values */ - HDmemcpy(dt->shared->u.enumer.value, *pp, + H5MM_memcpy(dt->shared->u.enumer.value, *pp, dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size); *pp += dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size; break; @@ -882,7 +882,7 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt) z = HDstrlen(dt->shared->u.opaque.tag); aligned = (z + 7) & (H5T_OPAQUE_TAG_MAX - 8); flags = (unsigned)(flags | aligned); - HDmemcpy(*pp, dt->shared->u.opaque.tag, MIN(z,aligned)); + H5MM_memcpy(*pp, dt->shared->u.opaque.tag, MIN(z,aligned)); for(n = MIN(z, aligned); n < aligned; n++) (*pp)[n] = 0; *pp += aligned; @@ -997,7 +997,7 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt) } /* end for */ /* Values */ - HDmemcpy(*pp, dt->shared->u.enumer.value, dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size); + H5MM_memcpy(*pp, dt->shared->u.enumer.value, dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size); *pp += dt->shared->u.enumer.nmembs * dt->shared->parent->shared->size; break; |