summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2017-01-03 16:28:05 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2017-01-03 16:28:05 (GMT)
commite73a32b85288319298c1e39b9cf92fb42a838924 (patch)
treef79fab89632a0d0b1ec460ab20eefc328b20b99c /test
parentedd3ff309894decb3eaabce5c91b24f89286d177 (diff)
downloadhdf5-e73a32b85288319298c1e39b9cf92fb42a838924.zip
hdf5-e73a32b85288319298c1e39b9cf92fb42a838924.tar.gz
hdf5-e73a32b85288319298c1e39b9cf92fb42a838924.tar.bz2
Remove 'const' from cache client pre_serialize callback, to reduce warnings,
and correspondingly remove 'const' from some internal routines. Also rename some H5MF* routines to reflect their static/package usage.
Diffstat (limited to 'test')
-rw-r--r--test/cache_common.c48
-rw-r--r--test/mf.c54
2 files changed, 51 insertions, 51 deletions
diff --git a/test/cache_common.c b/test/cache_common.c
index f387f05..0061f31 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -128,37 +128,37 @@ static herr_t monster_image_len(const void *thing, size_t *image_len_ptr);
static herr_t variable_image_len(const void *thing, size_t *image_len_ptr);
static herr_t notify_image_len(const void *thing, size_t *image_len_ptr);
-static herr_t pico_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t pico_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t nano_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t nano_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t micro_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t micro_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t tiny_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t tiny_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t small_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t small_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t medium_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t medium_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t large_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t large_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t huge_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t huge_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t monster_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t monster_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t variable_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t variable_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
-static herr_t notify_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t notify_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr,
size_t *new_len_ptr, unsigned *flags_ptr);
@@ -211,7 +211,7 @@ static herr_t get_final_load_size(const void *image, size_t image_len,
static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr,
hbool_t *dirty_ptr, int32_t entry_type);
static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type);
-static herr_t pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
+static herr_t pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr,
unsigned *flags_ptr);
static herr_t serialize(const H5F_t *f, void *image_ptr, size_t len,
@@ -1114,7 +1114,7 @@ notify_image_len(const void *thing, size_t *image_length)
*-------------------------------------------------------------------------
*/
herr_t
-pre_serialize(const H5F_t *f,
+pre_serialize(H5F_t *f,
hid_t H5_ATTR_UNUSED dxpl_id,
void *thing,
haddr_t addr,
@@ -1199,7 +1199,7 @@ pre_serialize(const H5F_t *f,
} /* pre_serialize() */
herr_t
-pico_pre_serialize(const H5F_t *f,
+pico_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1213,7 +1213,7 @@ pico_pre_serialize(const H5F_t *f,
}
herr_t
-nano_pre_serialize(const H5F_t *f,
+nano_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1227,7 +1227,7 @@ nano_pre_serialize(const H5F_t *f,
}
herr_t
-micro_pre_serialize(const H5F_t *f,
+micro_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1241,7 +1241,7 @@ micro_pre_serialize(const H5F_t *f,
}
herr_t
-tiny_pre_serialize(const H5F_t *f,
+tiny_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1255,7 +1255,7 @@ tiny_pre_serialize(const H5F_t *f,
}
herr_t
-small_pre_serialize(const H5F_t *f,
+small_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1269,7 +1269,7 @@ small_pre_serialize(const H5F_t *f,
}
herr_t
-medium_pre_serialize(const H5F_t *f,
+medium_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1283,7 +1283,7 @@ medium_pre_serialize(const H5F_t *f,
}
herr_t
-large_pre_serialize(const H5F_t *f,
+large_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1297,7 +1297,7 @@ large_pre_serialize(const H5F_t *f,
}
herr_t
-huge_pre_serialize(const H5F_t *f,
+huge_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1311,7 +1311,7 @@ huge_pre_serialize(const H5F_t *f,
}
herr_t
-monster_pre_serialize(const H5F_t *f,
+monster_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1325,7 +1325,7 @@ monster_pre_serialize(const H5F_t *f,
}
herr_t
-variable_pre_serialize(const H5F_t *f,
+variable_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
@@ -1339,7 +1339,7 @@ variable_pre_serialize(const H5F_t *f,
}
herr_t
-notify_pre_serialize(const H5F_t *f,
+notify_pre_serialize(H5F_t *f,
hid_t dxpl_id,
void *thing,
haddr_t addr,
diff --git a/test/mf.c b/test/mf.c
index e3d1845..f56c7ab 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -980,7 +980,7 @@ test_mf_fs_start(hid_t fapl)
frspace_state_t state;
- TESTING("H5MF_alloc_create()/H5MF_alloc_open() of free-space manager");
+ TESTING("H5MF_alloc_create()/H5MF__alloc_open() of free-space manager");
/* Set the filename to use for this test (dependent on fapl) */
h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
@@ -1014,7 +1014,7 @@ test_mf_fs_start(hid_t fapl)
/* Start up free-space manager */
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -1131,7 +1131,7 @@ test_mf_fs_alloc_free(hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -1218,7 +1218,7 @@ test_mf_fs_alloc_free(hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -1303,7 +1303,7 @@ test_mf_fs_alloc_free(hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -1489,7 +1489,7 @@ test_mf_fs_extend(hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -1607,7 +1607,7 @@ test_mf_fs_extend(hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -1720,7 +1720,7 @@ test_mf_fs_extend(hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -1833,7 +1833,7 @@ test_mf_fs_extend(hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -2025,7 +2025,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -2095,7 +2095,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -4083,7 +4083,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -4153,7 +4153,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -4243,7 +4243,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl)
type = H5FD_MEM_SUPER;
- if(H5MF_alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_start(f, H5AC_ind_read_dxpl_id, type) < 0)
TEST_ERROR
if (f->shared->fs_state[type] != H5F_FS_STATE_OPEN)
@@ -6223,7 +6223,7 @@ test_mf_fs_persist(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Get info for free-space manager */
@@ -6368,7 +6368,7 @@ test_mf_fs_gone(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Get info for H5FD_MEM_SUPER free-space manager */
@@ -6495,7 +6495,7 @@ test_mf_fs_split(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6519,7 +6519,7 @@ test_mf_fs_split(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_DRAW free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, stype) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, stype) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6583,7 +6583,7 @@ test_mf_fs_split(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6623,7 +6623,7 @@ test_mf_fs_split(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6730,7 +6730,7 @@ test_mf_fs_multi(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6754,7 +6754,7 @@ test_mf_fs_multi(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_DRAW free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, stype) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, stype) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6812,7 +6812,7 @@ test_mf_fs_multi(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6838,7 +6838,7 @@ test_mf_fs_multi(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_BTREE free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, btype) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, btype) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -6876,7 +6876,7 @@ test_mf_fs_multi(hid_t fapl_new, hid_t fcpl)
/* If H5FD_MEM_SUPER is there, should not find block #1 & #3 */
if(H5F_addr_defined(f->shared->fs_addr[type])) {
/* Start up H5FD_MEM_SUPER free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
if((node_found = H5FS_sect_find(f, H5AC_ind_read_dxpl_id, f->shared->fs_man[type],
@@ -6895,7 +6895,7 @@ test_mf_fs_multi(hid_t fapl_new, hid_t fcpl)
TEST_ERROR
/* Start up H5FD_MEM_GHEAP free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, gtype) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, gtype) < 0)
FAIL_STACK_ERROR
/* Get free-space info */
@@ -7189,7 +7189,7 @@ test_filespace_strategy_threshold(hid_t fapl_new)
TEST_ERROR
/* Open the free-space manager */
- if(H5MF_alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
+ if(H5MF__alloc_open(f, H5AC_ind_read_dxpl_id, type) < 0)
FAIL_STACK_ERROR
/* Retrieve the total amount of free space and # of free-space sections */