diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2012-10-05 02:25:37 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-10-05 02:25:37 (GMT) |
commit | cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0 (patch) | |
tree | 5d32921750c5d88b3b4ef33f7710171156b0faea /src/H5Pfapl.c | |
parent | 223bdd117305e813a137c1874ec8c7327968ccf3 (diff) | |
download | hdf5-cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0.zip hdf5-cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0.tar.gz hdf5-cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0.tar.bz2 |
[svn-r22866] Description:
Correct use of 'uint8_t' parameter type in public header file (which was
causing Windows builds to fail).
Tested on:
Mac OSX/64 10.7.5 (amazon) w/debug
(too minor to require h5committest)
Diffstat (limited to 'src/H5Pfapl.c')
-rw-r--r-- | src/H5Pfapl.c | 30 |
1 files changed, 18 insertions, 12 deletions
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 |