diff options
| author | hdftest <hdftest@hdfgroup.org> | 2018-06-24 23:26:17 (GMT) |
|---|---|---|
| committer | hdftest <hdftest@hdfgroup.org> | 2018-06-24 23:26:17 (GMT) |
| commit | bac6bc52d33860cb67281e005dfe08336e16480e (patch) | |
| tree | 83b9e6782bc080051d3056f5610952a4bef08ca9 /src/H5Pstrcpl.c | |
| parent | e9f476dad47ce593f13dacb77b1cc664d1f24e7b (diff) | |
| parent | b193bc11c966d79b76ebc3bbe76728f0693693ef (diff) | |
| download | hdf5-bac6bc52d33860cb67281e005dfe08336e16480e.zip hdf5-bac6bc52d33860cb67281e005dfe08336e16480e.tar.gz hdf5-bac6bc52d33860cb67281e005dfe08336e16480e.tar.bz2 | |
Merge pull request #1117 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit 'b193bc11c966d79b76ebc3bbe76728f0693693ef':
Revert "Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop"
Diffstat (limited to 'src/H5Pstrcpl.c')
| -rw-r--r-- | src/H5Pstrcpl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c index b84d69b..fb91356 100644 --- a/src/H5Pstrcpl.c +++ b/src/H5Pstrcpl.c @@ -69,7 +69,7 @@ static herr_t H5P__strcrt_reg_prop(H5P_genclass_t *pclass); /* encode & decode callbacks */ -static herr_t H5P__strcrt_char_encoding_enc(const void *value, void **_pp, size_t *size, void *udata); +static herr_t H5P__strcrt_char_encoding_enc(const void *value, void **_pp, size_t *size); static herr_t H5P__strcrt_char_encoding_dec(const void **_pp, void *value); @@ -227,7 +227,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5P__strcrt_char_encoding_enc(const void *value, void **_pp, size_t *size, void H5_ATTR_UNUSED *udata) +H5P__strcrt_char_encoding_enc(const void *value, void **_pp, size_t *size) { const H5T_cset_t *encoding = (const H5T_cset_t *)value; /* Create local alias for values */ uint8_t **pp = (uint8_t **)_pp; |