[svn-r22868] Merging r22856 through r22867 from trunk.

1 files changed, 18 insertions, 12 deletions

diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 9de09a2..0636095 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -197,13 +197,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);
 
 
 /*********************/
@@ -2804,9 +2804,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 */
 
@@ -2948,9 +2949,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 */
@@ -3082,9 +3084,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
 
@@ -3119,9 +3122,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
 
@@ -3153,9 +3157,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
 
@@ -3190,9 +3195,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