diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2015-05-04 20:47:05 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2015-05-04 20:47:05 (GMT) |
| commit | 0918faa89e1283a3ecefda7845eeff8bc0fcc738 (patch) | |
| tree | fece350ecc5b404ddd8b6d3484a0307013be523b | |
| parent | 77dc445a3d3d037255aaf13f6c55053c41621f74 (diff) | |
| download | hdf5-0918faa89e1283a3ecefda7845eeff8bc0fcc738.zip hdf5-0918faa89e1283a3ecefda7845eeff8bc0fcc738.tar.gz hdf5-0918faa89e1283a3ecefda7845eeff8bc0fcc738.tar.bz2 | |
[svn-r27010] Merge r27009 from trunk
Fix mismatching prototypes in H5FD/H5B2
| -rw-r--r-- | src/H5B2pkg.h | 14 | ||||
| -rw-r--r-- | src/H5FD.c | 4 | ||||
| -rw-r--r-- | src/H5FDprivate.h | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index b820853..3247215 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -326,16 +326,18 @@ H5_DLL herr_t H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, /* Routines for removing records */ H5_DLL herr_t H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, - hbool_t *depth_decreased, void *swap_loc, unsigned depth, H5AC_info_t *parent_cache_info, - hbool_t * parent_cache_info_dirtied_ptr, H5B2_node_ptr_t *curr_node_ptr, void *udata, - H5B2_remove_t op, void *op_data); + hbool_t *depth_decreased, void *swap_loc, unsigned depth, + H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr, + H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op, + void *op_data); H5_DLL herr_t H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op, void *op_data); H5_DLL herr_t H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, - hbool_t *depth_decreased, void *swap_loc, unsigned depth, H5AC_info_t *parent_cache_info, - hbool_t * parent_cache_info_dirtied_ptr, H5B2_node_ptr_t *curr_node_ptr, hsize_t idx, - H5B2_remove_t op, void *op_data); + hbool_t *depth_decreased, void *swap_loc, unsigned depth, + H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr, + H5B2_node_ptr_t *curr_node_ptr, hsize_t n, H5B2_remove_t op, + void *op_data); H5_DLL herr_t H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr, unsigned idx, H5B2_remove_t op, void *op_data); @@ -1858,7 +1858,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5FDtruncate(H5FD_t *file, hid_t dxpl_id, unsigned closing) +H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1897,7 +1897,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5FD_truncate(H5FD_t *file, hid_t dxpl_id, unsigned closing) +H5FD_truncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index a11fc01..92e613f 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -134,7 +134,7 @@ H5_DLL herr_t H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t typ haddr_t addr, size_t size, void *buf/*out*/); H5_DLL herr_t H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size, const void *buf); -H5_DLL herr_t H5FD_flush(H5FD_t *file, hid_t dxpl_id, hbool_t closing); +H5_DLL herr_t H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned closing); H5_DLL herr_t H5FD_truncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing); H5_DLL herr_t H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum); H5_DLL herr_t H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void** file_handle); |