summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5Pdcpl.c30
-rw-r--r--src/H5Pdxpl.c70
-rw-r--r--src/H5Pencdec.c48
-rw-r--r--src/H5Pfapl.c30
-rw-r--r--src/H5Pfcpl.c30
-rw-r--r--src/H5Pgcpl.c20
-rw-r--r--src/H5Plapl.c20
-rw-r--r--src/H5Pocpl.c10
-rw-r--r--src/H5Pocpypl.c10
-rw-r--r--src/H5Ppkg.h24
-rw-r--r--src/H5Ppublic.h4
-rw-r--r--src/H5Pstrcpl.c10
12 files changed, 184 insertions, 122 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 7565e8f..b3090ab 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -126,13 +126,13 @@ static herr_t H5P__dcrt_copy(hid_t new_plist_t, hid_t old_plist_t, void *copy_da
static herr_t H5P__dcrt_close(hid_t dxpl_id, void *close_data);
/* Property callbacks */
-static herr_t H5P__dcrt_layout_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dcrt_layout_dec(const uint8_t **pp, void *value);
+static herr_t H5P__dcrt_layout_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dcrt_layout_dec(const void **pp, void *value);
static int H5P__dcrt_layout_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P__fill_value_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__fill_value_dec(const uint8_t **pp, void *value);
-static herr_t H5P__dcrt_ext_file_list_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dcrt_ext_file_list_dec(const uint8_t **pp, void *value);
+static herr_t H5P__fill_value_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__fill_value_dec(const void **pp, void *value);
+static herr_t H5P__dcrt_ext_file_list_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dcrt_ext_file_list_dec(const void **pp, void *value);
static int H5P__dcrt_ext_file_list_cmp(const void *value1, const void *value2, size_t size);
@@ -414,9 +414,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dcrt_layout_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dcrt_layout_enc(const void *value, void **_pp, size_t *size)
{
const H5O_layout_t *layout = (const H5O_layout_t *)value; /* Create local aliases for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -471,11 +472,12 @@ H5P__dcrt_layout_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dcrt_layout_dec(const uint8_t **pp, void *value)
+H5P__dcrt_layout_dec(const void **_pp, void *value)
{
const H5O_layout_t *layout; /* Storage layout */
H5O_layout_t chunk_layout; /* Layout structure for chunk info */
H5D_layout_t type; /* Layout type */
+ const uint8_t **pp = (const uint8_t **)_pp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
@@ -627,11 +629,12 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fill_value_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__fill_value_enc(const void *value, void **_pp, size_t *size)
{
const H5O_fill_t *fill = (const H5O_fill_t *)value; /* Create local aliases for values */
size_t dt_size = 0; /* Size of encoded datatype */
herr_t ret_value = SUCCEED; /* Return value */
+ uint8_t **pp = (uint8_t **)_pp;
uint64_t enc_value;
unsigned enc_size;
@@ -721,9 +724,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fill_value_dec(const uint8_t **pp, void *_value)
+H5P__fill_value_dec(const void **_pp, void *_value)
{
H5O_fill_t *fill = (H5O_fill_t *)_value; /* Fill value */
+ const uint8_t **pp = (const uint8_t **)_pp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
@@ -848,11 +852,12 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dcrt_ext_file_list_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dcrt_ext_file_list_enc(const void *value, void **_pp, size_t *size)
{
const H5O_efl_t *efl = (const H5O_efl_t *)value; /* Create local aliases for values */
size_t len = 0; /* String length of slot name */
size_t u; /* Local index variable */
+ uint8_t **pp = (uint8_t **)_pp;
unsigned enc_size;
uint64_t enc_value;
@@ -933,9 +938,10 @@ H5P__dcrt_ext_file_list_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dcrt_ext_file_list_dec(const uint8_t **pp, void *_value)
+H5P__dcrt_ext_file_list_dec(const void **_pp, void *_value)
{
H5O_efl_t *efl = (H5O_efl_t *)_value; /* External file list */
+ const uint8_t **pp = (const uint8_t **)_pp;
size_t u, nused;
unsigned enc_size;
uint64_t enc_value;
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index d4218fe..04ff54a 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -177,20 +177,20 @@
static herr_t H5P__dxfr_reg_prop(H5P_genclass_t *pclass);
/* Property list callbacks */
-static herr_t H5P__dxfr_bkgr_buf_type_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dxfr_bkgr_buf_type_dec(const uint8_t **pp, void *value);
-static herr_t H5P__dxfr_btree_split_ratio_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dxfr_btree_split_ratio_dec(const uint8_t **pp, void *value);
-static herr_t H5P__dxfr_io_xfer_mode_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dxfr_io_xfer_mode_dec(const uint8_t **pp, void *value);
-static herr_t H5P__dxfr_mpio_collective_opt_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dxfr_mpio_collective_opt_dec(const uint8_t **pp, void *value);
-static herr_t H5P__dxfr_mpio_chunk_opt_hard_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dxfr_mpio_chunk_opt_hard_dec(const uint8_t **pp, void *value);
-static herr_t H5P__dxfr_edc_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dxfr_edc_dec(const uint8_t **pp, void *value);
-static herr_t H5P__dxfr_xform_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__dxfr_xform_dec(const uint8_t **pp, void *value);
+static herr_t H5P__dxfr_bkgr_buf_type_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dxfr_bkgr_buf_type_dec(const void **pp, void *value);
+static herr_t H5P__dxfr_btree_split_ratio_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dxfr_btree_split_ratio_dec(const void **pp, void *value);
+static herr_t H5P__dxfr_io_xfer_mode_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dxfr_io_xfer_mode_dec(const void **pp, void *value);
+static herr_t H5P__dxfr_mpio_collective_opt_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dxfr_mpio_collective_opt_dec(const void **pp, void *value);
+static herr_t H5P__dxfr_mpio_chunk_opt_hard_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dxfr_mpio_chunk_opt_hard_dec(const void **pp, void *value);
+static herr_t H5P__dxfr_edc_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dxfr_edc_dec(const void **pp, void *value);
+static herr_t H5P__dxfr_xform_enc(const void *value, void **pp, size_t *size);
+static herr_t H5P__dxfr_xform_dec(const void **pp, void *value);
static herr_t H5P__dxfr_xform_del(hid_t prop_id, const char* name, size_t size, void* value);
static herr_t H5P__dxfr_xform_copy(const char* name, size_t size, void* value);
static int H5P__dxfr_xform_cmp(const void *value1, const void *value2, size_t size);
@@ -447,9 +447,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_bkgr_buf_type_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dxfr_bkgr_buf_type_enc(const void *value, void **_pp, size_t *size)
{
const H5T_bkg_t *bkgr_buf_type = (const H5T_bkg_t *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -484,9 +485,10 @@ H5P__dxfr_bkgr_buf_type_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_bkgr_buf_type_dec(const uint8_t **pp, void *_value)
+H5P__dxfr_bkgr_buf_type_dec(const void **_pp, void *_value)
{
H5T_bkg_t *bkgr_buf_type = (H5T_bkg_t *)_value; /* Background buffer type */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -518,9 +520,10 @@ H5P__dxfr_bkgr_buf_type_dec(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_btree_split_ratio_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dxfr_btree_split_ratio_enc(const void *value, void **_pp, size_t *size)
{
const double *btree_split_ratio = (const double *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -567,10 +570,11 @@ H5P__dxfr_btree_split_ratio_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_btree_split_ratio_dec(const uint8_t **pp, void *_value)
+H5P__dxfr_btree_split_ratio_dec(const void **_pp, void *_value)
{
double *btree_split_ratio = (double *)_value; /* B-tree split ratio */
unsigned enc_size; /* Size of encoded property */
+ const uint8_t **pp = (const uint8_t **)_pp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
@@ -611,11 +615,12 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_xform_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dxfr_xform_enc(const void *value, void **_pp, size_t *size)
{
const H5Z_data_xform_t *data_xform_prop = *(const H5Z_data_xform_t * const *)value; /* Create local alias for values */
const char *pexp = NULL; /* Pointer to transform expression */
size_t len = 0; /* Length of transform expression */
+ uint8_t **pp = (uint8_t **)_pp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
@@ -682,10 +687,11 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_xform_dec(const uint8_t **pp, void *_value)
+H5P__dxfr_xform_dec(const void **_pp, void *_value)
{
H5Z_data_xform_t **data_xform_prop = (H5Z_data_xform_t **)_value; /* New data xform property */
size_t len; /* Length of encoded string */
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned enc_size;
uint64_t enc_value;
herr_t ret_value = SUCCEED; /* Return value */
@@ -1702,9 +1708,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_io_xfer_mode_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dxfr_io_xfer_mode_enc(const void *value, void **_pp, size_t *size)
{
const H5FD_mpio_xfer_t *xfer_mode = (const H5FD_mpio_xfer_t *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -1739,9 +1746,10 @@ H5P__dxfr_io_xfer_mode_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_io_xfer_mode_dec(const uint8_t **pp, void *_value)
+H5P__dxfr_io_xfer_mode_dec(const void **_pp, void *_value)
{
H5FD_mpio_xfer_t *xfer_mode = (H5FD_mpio_xfer_t *)_value; /* I/O transfer mode */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -1773,9 +1781,10 @@ H5P__dxfr_io_xfer_mode_dec(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_mpio_collective_opt_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dxfr_mpio_collective_opt_enc(const void *value, void **_pp, size_t *size)
{
const H5FD_mpio_collective_opt_t *coll_opt = (const H5FD_mpio_collective_opt_t *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -1810,9 +1819,10 @@ H5P__dxfr_mpio_collective_opt_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_mpio_collective_opt_dec(const uint8_t **pp, void *_value)
+H5P__dxfr_mpio_collective_opt_dec(const void **_pp, void *_value)
{
H5FD_mpio_collective_opt_t *coll_opt = (H5FD_mpio_collective_opt_t *)_value; /* MPI-I/O collective optimization mode */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -1844,9 +1854,10 @@ H5P__dxfr_mpio_collective_opt_dec(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_mpio_chunk_opt_hard_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dxfr_mpio_chunk_opt_hard_enc(const void *value, void **_pp, size_t *size)
{
const H5FD_mpio_chunk_opt_t *chunk_opt = (const H5FD_mpio_chunk_opt_t *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -1881,9 +1892,10 @@ H5P__dxfr_mpio_chunk_opt_hard_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_mpio_chunk_opt_hard_dec(const uint8_t **pp, void *_value)
+H5P__dxfr_mpio_chunk_opt_hard_dec(const void **_pp, void *_value)
{
H5FD_mpio_chunk_opt_t *chunk_opt = (H5FD_mpio_chunk_opt_t *)_value; /* MPI-I/O chunk optimization mode */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -2027,9 +2039,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_edc_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__dxfr_edc_enc(const void *value, void **_pp, size_t *size)
{
const H5Z_EDC_t *check = (const H5Z_EDC_t *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -2064,9 +2077,10 @@ H5P__dxfr_edc_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__dxfr_edc_dec(const uint8_t **pp, void *_value)
+H5P__dxfr_edc_dec(const void **_pp, void *_value)
{
H5Z_EDC_t *check = (H5Z_EDC_t *)_value; /* EDC property */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
diff --git a/src/H5Pencdec.c b/src/H5Pencdec.c
index 11439db..ff148b0 100644
--- a/src/H5Pencdec.c
+++ b/src/H5Pencdec.c
@@ -54,7 +54,7 @@
typedef struct {
hbool_t encode; /* Whether the property list should be encoded */
size_t *enc_size_ptr; /* Pointer to size of encoded buffer */
- uint8_t **pp; /* Pointer to encoding buffer pointer */
+ void **pp; /* Pointer to encoding buffer pointer */
} H5P_enc_iter_ud_t;
@@ -114,9 +114,10 @@ H5P_init_encdec_interface(void)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__encode_size_t(const void *value, uint8_t **pp, size_t *size)
+H5P__encode_size_t(const void *value, void **_pp, size_t *size)
{
uint64_t enc_value = (uint64_t)*(const size_t *)value; /* Property value to encode */
+ uint8_t **pp = (uint8_t **)_pp;
unsigned enc_size = H5V_limit_enc_size(enc_value); /* Size of encoded property */
FUNC_ENTER_PACKAGE_NOERR
@@ -155,10 +156,11 @@ H5P__encode_size_t(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__encode_hsize_t(const void *value, uint8_t **pp, size_t *size)
+H5P__encode_hsize_t(const void *value, void **_pp, size_t *size)
{
uint64_t enc_value = (uint64_t)*(const hsize_t *)value; /* Property value to encode */
unsigned enc_size = H5V_limit_enc_size(enc_value); /* Size of encoded property */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_PACKAGE_NOERR
@@ -195,8 +197,10 @@ H5P__encode_hsize_t(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__encode_unsigned(const void *value, uint8_t **pp, size_t *size)
+H5P__encode_unsigned(const void *value, void **_pp, size_t *size)
{
+ uint8_t **pp = (uint8_t **)_pp;
+
FUNC_ENTER_PACKAGE_NOERR
/* Sanity checks */
@@ -232,8 +236,10 @@ H5P__encode_unsigned(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__encode_uint8_t(const void *value, uint8_t **pp, size_t *size)
+H5P__encode_uint8_t(const void *value, void **_pp, size_t *size)
{
+ uint8_t **pp = (uint8_t **)_pp;
+
FUNC_ENTER_PACKAGE_NOERR
/* Sanity checks */
@@ -266,8 +272,10 @@ H5P__encode_uint8_t(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__encode_hbool_t(const void *value, uint8_t **pp, size_t *size)
+H5P__encode_hbool_t(const void *value, void **_pp, size_t *size)
{
+ uint8_t **pp = (uint8_t **)_pp;
+
FUNC_ENTER_PACKAGE_NOERR
/* Sanity checks */
@@ -299,8 +307,10 @@ H5P__encode_hbool_t(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__encode_double(const void *value, uint8_t **pp, size_t *size)
+H5P__encode_double(const void *value, void **_pp, size_t *size)
{
+ uint8_t **pp = (uint8_t **)_pp;
+
FUNC_ENTER_PACKAGE_NOERR
/* Sanity checks */
@@ -363,7 +373,7 @@ H5P__encode_cb(H5P_genprop_t *prop, void *_udata)
prop_name_len = HDstrlen(prop->name) + 1;
if(udata->encode) {
HDstrncpy((char *)*(udata->pp), prop->name, prop_name_len);
- *(udata->pp) += prop_name_len;
+ *(uint8_t **)(udata->pp) += prop_name_len;
} /* end if */
*(udata->enc_size_ptr) += prop_name_len;
@@ -438,7 +448,7 @@ H5P__encode(const H5P_genplist_t *plist, hbool_t enc_all_prop, void *buf,
/* Initialize user data for iteration callback */
udata.encode = encode;
udata.enc_size_ptr = &encode_size;
- udata.pp = &p;
+ udata.pp = (void **)&p;
/* Iterate over all properties in property list, encoding them */
idx = 0;
@@ -472,9 +482,10 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5P__decode_size_t(const uint8_t **pp, void *_value)
+H5P__decode_size_t(const void **_pp, void *_value)
{
size_t *value = (size_t *)_value; /* Property value to return */
+ const uint8_t **pp = (const uint8_t **)_pp;
uint64_t enc_value; /* Decoded property value */
unsigned enc_size; /* Size of encoded property */
@@ -512,9 +523,10 @@ H5P__decode_size_t(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__decode_hsize_t(const uint8_t **pp, void *_value)
+H5P__decode_hsize_t(const void **_pp, void *_value)
{
hsize_t *value = (hsize_t *)_value; /* Property value to return */
+ const uint8_t **pp = (const uint8_t **)_pp;
uint64_t enc_value; /* Decoded property value */
unsigned enc_size; /* Size of encoded property */
@@ -552,9 +564,10 @@ H5P__decode_hsize_t(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__decode_unsigned(const uint8_t **pp, void *_value)
+H5P__decode_unsigned(const void **_pp, void *_value)
{
unsigned *value = (unsigned *)_value; /* Property value to return */
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned enc_size; /* Size of encoded property */
herr_t ret_value = SUCCEED; /* Return value */
@@ -591,9 +604,10 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5P__decode_uint8_t(const uint8_t **pp, void *_value)
+H5P__decode_uint8_t(const void **_pp, void *_value)
{
uint8_t *value = (uint8_t *)_value; /* Property value to return */
+ const uint8_t **pp = (const uint8_t **)_pp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE_NOERR
@@ -624,9 +638,10 @@ H5P__decode_uint8_t(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__decode_hbool_t(const uint8_t **pp, void *_value)
+H5P__decode_hbool_t(const void **_pp, void *_value)
{
hbool_t *value = (hbool_t *)_value; /* Property value to return */
+ const uint8_t **pp = (const uint8_t **)_pp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE_NOERR
@@ -657,9 +672,10 @@ H5P__decode_hbool_t(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
herr_t
-H5P__decode_double(const uint8_t **pp, void *_value)
+H5P__decode_double(const void **_pp, void *_value)
{
double *value = (double *)_value; /* Property value to return */
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned enc_size; /* Size of encoded property */
herr_t ret_value = SUCCEED; /* Return value */
@@ -767,7 +783,7 @@ H5P__decode(const void *buf)
/* Decode serialized value */
if(prop->decode) {
- if((prop->decode)(&p, value_buf) < 0)
+ if((prop->decode)((const void **)&p, value_buf) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTDECODE, FAIL, "property decoding routine failed, property: '%s'", name)
} /* end if */
else
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 35752c4..4faed4f 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -187,13 +187,13 @@ static herr_t H5P_file_image_info_copy(const char *name, size_t size, void *valu
static herr_t H5P_file_image_info_close(const char *name, size_t size, void *value);
/* encode & decode callbacks */
-static herr_t H5P__facc_cache_config_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__facc_cache_config_dec(const uint8_t **pp, void *value);
+static herr_t H5P__facc_cache_config_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__facc_cache_config_dec(const void **_pp, void *value);
static int H5P__facc_cache_config_cmp(const void *value1, const void *value2, size_t size);
-static herr_t H5P__facc_fclose_degree_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__facc_fclose_degree_dec(const uint8_t **pp, void *value);
-static herr_t H5P__facc_multi_type_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__facc_multi_type_dec(const uint8_t **pp, void *value);
+static herr_t H5P__facc_fclose_degree_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__facc_fclose_degree_dec(const void **pp, void *value);
+static herr_t H5P__facc_multi_type_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__facc_multi_type_dec(const void **_pp, void *value);
/*********************/
@@ -2571,9 +2571,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__facc_cache_config_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__facc_cache_config_enc(const void *value, void **_pp, size_t *size)
{
const H5AC_cache_config_t *config = (const H5AC_cache_config_t *)value; /* Create local aliases for values */
+ uint8_t **pp = (uint8_t **)_pp;
unsigned enc_size; /* Size of encoded property */
uint64_t enc_value; /* Property to encode */
@@ -2715,9 +2716,10 @@ H5P__facc_cache_config_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__facc_cache_config_dec(const uint8_t **pp, void *_value)
+H5P__facc_cache_config_dec(const void **_pp, void *_value)
{
H5AC_cache_config_t *config = (H5AC_cache_config_t *)_value;
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned enc_size;
uint64_t enc_value;
herr_t ret_value = SUCCEED; /* Return value */
@@ -2849,9 +2851,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__facc_fclose_degree_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__facc_fclose_degree_enc(const void *value, void **_pp, size_t *size)
{
const H5F_close_degree_t *fclose_degree = (const H5F_close_degree_t *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -2886,9 +2889,10 @@ H5P__facc_fclose_degree_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__facc_fclose_degree_dec(const uint8_t **pp, void *_value)
+H5P__facc_fclose_degree_dec(const void **_pp, void *_value)
{
H5F_close_degree_t *fclose_degree = (H5F_close_degree_t *)_value; /* File close degree */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -2920,9 +2924,10 @@ H5P__facc_fclose_degree_dec(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__facc_multi_type_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__facc_multi_type_enc(const void *value, void **_pp, size_t *size)
{
const H5FD_mem_t *type = (const H5FD_mem_t *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -2957,9 +2962,10 @@ H5P__facc_multi_type_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__facc_multi_type_dec(const uint8_t **pp, void *_value)
+H5P__facc_multi_type_dec(const void **_pp, void *_value)
{
H5FD_mem_t *type = (H5FD_mem_t *)_value; /* File close degree */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 0876840..3eb9c5b 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -124,12 +124,12 @@
static herr_t H5P_fcrt_reg_prop(H5P_genclass_t *pclass);
/* property callbacks */
-static herr_t H5P__fcrt_btree_rank_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__fcrt_btree_rank_dec(const uint8_t **pp, void *value);
-static herr_t H5P__fcrt_shmsg_index_types_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__fcrt_shmsg_index_types_dec(const uint8_t **pp, void *value);
-static herr_t H5P__fcrt_shmsg_index_minsize_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__fcrt_shmsg_index_minsize_dec(const uint8_t **pp, void *value);
+static herr_t H5P__fcrt_btree_rank_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__fcrt_btree_rank_dec(const void **_pp, void *value);
+static herr_t H5P__fcrt_shmsg_index_types_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__fcrt_shmsg_index_types_dec(const void **_pp, void *value);
+static herr_t H5P__fcrt_shmsg_index_minsize_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__fcrt_shmsg_index_minsize_dec(const void **_pp, void *value);
/*********************/
@@ -689,9 +689,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fcrt_btree_rank_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__fcrt_btree_rank_enc(const void *value, void **_pp, size_t *size)
{
const unsigned *btree_k = (const unsigned *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -735,9 +736,10 @@ H5P__fcrt_btree_rank_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fcrt_btree_rank_dec(const uint8_t **pp, void *_value)
+H5P__fcrt_btree_rank_dec(const void **_pp, void *_value)
{
unsigned *btree_k = (unsigned *)_value;
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned enc_size; /* Size of encoded property */
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
@@ -978,9 +980,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fcrt_shmsg_index_types_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__fcrt_shmsg_index_types_enc(const void *value, void **_pp, size_t *size)
{
const unsigned *type_flags = (const unsigned *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -1025,9 +1028,10 @@ H5P__fcrt_shmsg_index_types_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fcrt_shmsg_index_types_dec(const uint8_t **pp, void *_value)
+H5P__fcrt_shmsg_index_types_dec(const void **_pp, void *_value)
{
unsigned *type_flags = (unsigned *)_value;
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned enc_size; /* Size of encoded property */
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
@@ -1069,9 +1073,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fcrt_shmsg_index_minsize_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__fcrt_shmsg_index_minsize_enc(const void *value, void **_pp, size_t *size)
{
const unsigned *minsizes = (const unsigned *)value; /* Create local alias for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -1116,9 +1121,10 @@ H5P__fcrt_shmsg_index_minsize_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__fcrt_shmsg_index_minsize_dec(const uint8_t **pp, void *_value)
+H5P__fcrt_shmsg_index_minsize_dec(const void **_pp, void *_value)
{
unsigned *minsizes = (unsigned *)_value;
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned enc_size; /* Size of encoded property */
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c
index 2bac037..0210700 100644
--- a/src/H5Pgcpl.c
+++ b/src/H5Pgcpl.c
@@ -67,10 +67,10 @@
static herr_t H5P__gcrt_reg_prop(H5P_genclass_t *pclass);
/* Property callbacks */
-static herr_t H5P__gcrt_group_info_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__gcrt_group_info_dec(const uint8_t **pp, void *value);
-static herr_t H5P__gcrt_link_info_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__gcrt_link_info_dec(const uint8_t **pp, void *value);
+static herr_t H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__gcrt_group_info_dec(const void **_pp, void *value);
+static herr_t H5P__gcrt_link_info_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__gcrt_link_info_dec(const void **_pp, void *value);
/*********************/
@@ -541,9 +541,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__gcrt_group_info_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size)
{
const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)value; /* Create local aliases for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -577,9 +578,10 @@ H5P__gcrt_group_info_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__gcrt_group_info_dec(const uint8_t **pp, void *_value)
+H5P__gcrt_group_info_dec(const void **_pp, void *_value)
{
H5O_ginfo_t *ginfo = (H5O_ginfo_t *)_value; /* Group info settings */
+ const uint8_t **pp = (const uint8_t **)_pp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC_NOERR
@@ -626,9 +628,10 @@ H5P__gcrt_group_info_dec(const uint8_t **pp, void *_value)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__gcrt_link_info_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__gcrt_link_info_enc(const void *value, void **_pp, size_t *size)
{
const H5O_linfo_t *linfo = (const H5O_linfo_t *)value; /* Create local aliases for values */
+ uint8_t **pp = (uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR
@@ -667,9 +670,10 @@ H5P__gcrt_link_info_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__gcrt_link_info_dec(const uint8_t **pp, void *_value)
+H5P__gcrt_link_info_dec(const void **_pp, void *_value)
{
H5O_linfo_t *linfo = (H5O_linfo_t *)_value; /* Link info settings */
+ const uint8_t **pp = (const uint8_t **)_pp;
unsigned crt_order_flags;
unsigned enc_size;
herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index e6bdaae..aa02546 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -101,14 +101,14 @@
static herr_t H5P_lacc_reg_prop(H5P_genclass_t *pclass);
/* Property list callbacks */
-static herr_t H5P_lacc_elink_pref_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P_lacc_elink_pref_dec(const uint8_t **pp, void *value);
+static herr_t H5P_lacc_elink_pref_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P_lacc_elink_pref_dec(const void **_pp, void *value);
static herr_t H5P_lacc_elink_pref_del(hid_t prop_id, const char* name, size_t size, void* value);
static herr_t H5P_lacc_elink_pref_copy(const char* name, size_t size, void* value);
static int H5P_lacc_elink_pref_cmp(const void *value1, const void *value2, size_t size);
static herr_t H5P_lacc_elink_pref_close(const char* name, size_t size, void* value);
-static herr_t H5P_lacc_elink_fapl_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P_lacc_elink_fapl_dec(const uint8_t **pp, void *value);
+static herr_t H5P_lacc_elink_fapl_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P_lacc_elink_fapl_dec(const void **_pp, void *value);
static herr_t H5P_lacc_elink_fapl_del(hid_t prop_id, const char* name, size_t size, void* value);
static herr_t H5P_lacc_elink_fapl_copy(const char* name, size_t size, void* value);
static int H5P_lacc_elink_fapl_cmp(const void *value1, const void *value2, size_t size);
@@ -228,9 +228,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P_lacc_elink_fapl_enc(const void *value, uint8_t **pp, size_t *size)
+H5P_lacc_elink_fapl_enc(const void *value, void **_pp, size_t *size)
{
const hid_t *elink_fapl = (const hid_t *)value; /* Property to encode */
+ uint8_t **pp = (uint8_t **)_pp;
H5P_genplist_t *fapl_plist; /* Pointer to property list */
hbool_t non_default_fapl = FALSE; /* Whether the FAPL is non-default */
size_t enc_size = 0; /* FAPL's encoded size */
@@ -282,9 +283,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P_lacc_elink_fapl_dec(const uint8_t **pp, void *_value)
+H5P_lacc_elink_fapl_dec(const void **_pp, void *_value)
{
hid_t *elink_fapl = (hid_t *)_value; /* The elink FAPL value */
+ const uint8_t **pp = (const uint8_t **)_pp;
hbool_t non_default_fapl; /* Whether the FAPL is non-default */
herr_t ret_value = SUCCEED; /* Return value */
@@ -495,9 +497,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P_lacc_elink_pref_enc(const void *value, uint8_t **pp, size_t *size)
+H5P_lacc_elink_pref_enc(const void *value, void **_pp, size_t *size)
{
const char *elink_pref = *(const char * const *)value;
+ uint8_t **pp = (uint8_t **)_pp;
size_t len = 0;
uint64_t enc_value;
unsigned enc_size;
@@ -550,9 +553,10 @@ H5P_lacc_elink_pref_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P_lacc_elink_pref_dec(const uint8_t **pp, void *_value)
+H5P_lacc_elink_pref_dec(const void **_pp, void *_value)
{
char **elink_pref = (char **)_value;
+ const uint8_t **pp = (const uint8_t **)_pp;
size_t len;
uint64_t enc_value; /* Decoded property value */
unsigned enc_size; /* Size of encoded property */
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index ba79da3..6e20963 100644
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -86,8 +86,8 @@ static herr_t H5P__ocrt_copy(hid_t new_plist_t, hid_t old_plist_t, void *copy_da
static herr_t H5P__ocrt_close(hid_t dxpl_id, void *close_data);
/* Property callbacks */
-static herr_t H5P__ocrt_pipeline_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__ocrt_pipeline_dec(const uint8_t **pp, void *value);
+static herr_t H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__ocrt_pipeline_dec(const void **_pp, void *value);
static int H5P__ocrt_pipeline_cmp(const void *value1, const void *value2, size_t size);
@@ -1366,9 +1366,10 @@ H5P_get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__ocrt_pipeline_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
{
const H5O_pline_t *pline = (const H5O_pline_t *)value;
+ uint8_t **pp = (uint8_t **)_pp;
size_t u; /* Local index variable */
FUNC_ENTER_STATIC_NOERR
@@ -1458,9 +1459,10 @@ H5P__ocrt_pipeline_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__ocrt_pipeline_dec(const uint8_t **pp, void *_value)
+H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
{
H5O_pline_t *pline = (H5O_pline_t *)_value; /* Property to set */
+ const uint8_t **pp = (const uint8_t **)_pp;
size_t nused; /* Number of filters used for pipeline */
unsigned enc_size; /* Size of encoded value (in bytes) */
uint64_t enc_value; /* Value to encode */
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c
index d2734b0..e5e5f51 100644
--- a/src/H5Pocpypl.c
+++ b/src/H5Pocpypl.c
@@ -85,8 +85,8 @@ static H5O_copy_dtype_merge_list_t *H5P__free_merge_comm_dtype_list(H5O_copy_dty
static herr_t H5P__ocpy_reg_prop(H5P_genclass_t *pclass);
/* Property callbacks */
-static herr_t H5P__ocpy_merge_comm_dt_list_enc(const void *value, uint8_t **pp, size_t *size);
-static herr_t H5P__ocpy_merge_comm_dt_list_dec(const uint8_t **pp, void *value);
+static herr_t H5P__ocpy_merge_comm_dt_list_enc(const void *value, void **_pp, size_t *size);
+static herr_t H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *value);
static herr_t H5P__ocpy_merge_comm_dt_list_copy(const char* name, size_t size, void* value);
static int H5P__ocpy_merge_comm_dt_list_cmp(const void *value1, const void *value2, size_t size);
static herr_t H5P__ocpy_merge_comm_dt_list_close(const char* name, size_t size, void* value);
@@ -219,9 +219,10 @@ H5P__free_merge_comm_dtype_list(H5O_copy_dtype_merge_list_t *dt_list)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__ocpy_merge_comm_dt_list_enc(const void *value, uint8_t **pp, size_t *size)
+H5P__ocpy_merge_comm_dt_list_enc(const void *value, void **_pp, size_t *size)
{
const H5O_copy_dtype_merge_list_t * const *dt_list_ptr = (const H5O_copy_dtype_merge_list_t * const *)value;
+ uint8_t **pp = (uint8_t **)_pp;
const H5O_copy_dtype_merge_list_t *dt_list; /* Pointer to merge named datatype list */
size_t len; /* Length of path component */
@@ -276,9 +277,10 @@ H5P__ocpy_merge_comm_dt_list_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__ocpy_merge_comm_dt_list_dec(const uint8_t **pp, void *_value)
+H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *_value)
{
H5O_copy_dtype_merge_list_t **dt_list = (H5O_copy_dtype_merge_list_t **)_value; /* Pointer to merge named datatype list */
+ const uint8_t **pp = (const uint8_t **)_pp;
H5O_copy_dtype_merge_list_t *dt_list_tail = NULL, *tmp_dt_list = NULL; /* temporary merge named datatype lists */
size_t len; /* Length of path component */
herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h
index b4c2405..9d48c60 100644
--- a/src/H5Ppkg.h
+++ b/src/H5Ppkg.h
@@ -207,18 +207,18 @@ H5_DLL hid_t H5P__new_plist_of_type(H5P_plist_type_t type);
H5_DLL herr_t H5P__encode(const H5P_genplist_t *plist, hbool_t enc_all_prop,
void *buf, size_t *nalloc);
H5_DLL hid_t H5P__decode(const void *buf);
-H5_DLL herr_t H5P__encode_hsize_t(const void *value, uint8_t **pp, size_t *size);
-H5_DLL herr_t H5P__encode_size_t(const void *value, uint8_t **pp, size_t *size);
-H5_DLL herr_t H5P__encode_unsigned(const void *value, uint8_t **pp, size_t *size);
-H5_DLL herr_t H5P__encode_uint8_t(const void *value, uint8_t **pp, size_t *size);
-H5_DLL herr_t H5P__encode_hbool_t(const void *value, uint8_t **pp, size_t *size);
-H5_DLL herr_t H5P__encode_double(const void *value, uint8_t **pp, size_t *size);
-H5_DLL herr_t H5P__decode_hsize_t(const uint8_t **pp, void *value);
-H5_DLL herr_t H5P__decode_size_t(const uint8_t **pp, void *value);
-H5_DLL herr_t H5P__decode_unsigned(const uint8_t **pp, void *value);
-H5_DLL herr_t H5P__decode_uint8_t(const uint8_t **pp, void *value);
-H5_DLL herr_t H5P__decode_hbool_t(const uint8_t **pp, void *value);
-H5_DLL herr_t H5P__decode_double(const uint8_t **pp, void *value);
+H5_DLL herr_t H5P__encode_hsize_t(const void *value, void **_pp, size_t *size);
+H5_DLL herr_t H5P__encode_size_t(const void *value, void **_pp, size_t *size);
+H5_DLL herr_t H5P__encode_unsigned(const void *value, void **_pp, size_t *size);
+H5_DLL herr_t H5P__encode_uint8_t(const void *value, void **_pp, size_t *size);
+H5_DLL herr_t H5P__encode_hbool_t(const void *value, void **_pp, size_t *size);
+H5_DLL herr_t H5P__encode_double(const void *value, void **_pp, size_t *size);
+H5_DLL herr_t H5P__decode_hsize_t(const void **_pp, void *value);
+H5_DLL herr_t H5P__decode_size_t(const void **_pp, void *value);
+H5_DLL herr_t H5P__decode_unsigned(const void **_pp, void *value);
+H5_DLL herr_t H5P__decode_uint8_t(const void **_pp, void *value);
+H5_DLL herr_t H5P__decode_hbool_t(const void **_pp, void *value);
+H5_DLL herr_t H5P__decode_double(const void **_pp, void *value);
/* Testing functions */
#ifdef H5P_TESTING
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 1143ab9..507bbb6 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -113,8 +113,8 @@ typedef herr_t (*H5P_prp_cb2_t)(hid_t prop_id, const char *name, size_t size, vo
typedef H5P_prp_cb1_t H5P_prp_create_func_t;
typedef H5P_prp_cb2_t H5P_prp_set_func_t;
typedef H5P_prp_cb2_t H5P_prp_get_func_t;
-typedef herr_t (*H5P_prp_encode_func_t)(const void *value, uint8_t **buf, size_t *size);
-typedef herr_t (*H5P_prp_decode_func_t)(const uint8_t **buf, void *value);
+typedef herr_t (*H5P_prp_encode_func_t)(const void *value, void **buf, size_t *size);
+typedef herr_t (*H5P_prp_decode_func_t)(const void **buf, void *value);
typedef H5P_prp_cb2_t H5P_prp_delete_func_t;
typedef H5P_prp_cb1_t H5P_prp_copy_func_t;
typedef int (*H5P_prp_compare_func_t)(const void *value1, const void *value2, size_t size);
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c
index 97b7ee3..bedacb0 100644
--- a/src/H5Pstrcpl.c
+++ b/src/H5Pstrcpl.c
@@ -68,8 +68,8 @@
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, uint8_t **pp, size_t *size);
-static herr_t H5P__strcrt_char_encoding_dec(const uint8_t **pp, void *value);
+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);
/*********************/
@@ -223,9 +223,10 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__strcrt_char_encoding_enc(const void *value, uint8_t **pp, size_t *size)
+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;
FUNC_ENTER_STATIC_NOERR
@@ -260,9 +261,10 @@ H5P__strcrt_char_encoding_enc(const void *value, uint8_t **pp, size_t *size)
*-------------------------------------------------------------------------
*/
static herr_t
-H5P__strcrt_char_encoding_dec(const uint8_t **pp, void *_value)
+H5P__strcrt_char_encoding_dec(const void **_pp, void *_value)
{
H5T_cset_t *encoding = (H5T_cset_t *)_value; /* Character set encoding */
+ const uint8_t **pp = (const uint8_t **)_pp;
FUNC_ENTER_STATIC_NOERR