diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-10-08 13:39:28 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-10-08 13:39:28 (GMT) |
| commit | 5f746a6614fa50be6d4ac465469cb262855be1da (patch) | |
| tree | 7354c1952fe896f68a63ff3e36d51df77fc1d787 /src/H5Pgcpl.c | |
| parent | c9157c5d5e4af4b6f350f932c9d9e13c3c51d8ed (diff) | |
| parent | cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0 (diff) | |
| download | hdf5-5f746a6614fa50be6d4ac465469cb262855be1da.zip hdf5-5f746a6614fa50be6d4ac465469cb262855be1da.tar.gz hdf5-5f746a6614fa50be6d4ac465469cb262855be1da.tar.bz2 | |
[svn-r22868] Merging r22856 through r22867 from trunk.
Diffstat (limited to 'src/H5Pgcpl.c')
| -rw-r--r-- | src/H5Pgcpl.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index 6e8176d..1d7d184 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); /*********************/ @@ -547,9 +547,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 @@ -583,9 +584,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 @@ -632,9 +634,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 @@ -673,9 +676,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 */ |