summaryrefslogtreecommitdiffstats
path: root/src/H5Fistore.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-06-23 13:24:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-06-23 13:24:56 (GMT)
commit403f1bac7cd811261a72faa8392edcecbe0e7563 (patch)
tree1f7bad287b30b06f27a8ca8fb4b343c1dfd1d9be /src/H5Fistore.c
parentff818d2d474b54787de2ef55b7fc9ba1bbcb1f29 (diff)
downloadhdf5-403f1bac7cd811261a72faa8392edcecbe0e7563.zip
hdf5-403f1bac7cd811261a72faa8392edcecbe0e7563.tar.gz
hdf5-403f1bac7cd811261a72faa8392edcecbe0e7563.tar.bz2
[svn-r7080] Purpose:
Bug fix (backward compatibility) Description: Changes we've made during development of the 1.5.x branch had broken the feature of allowing user's callbacks to H5Giterate to return a value through the library back to the application which called H5Giterate. Solution: Correctly pass along iterator callback return value and adjust internal library code to conform to this design. Platforms tested: FreeBSD 4.8 (sleipnir) h5committest
Diffstat (limited to 'src/H5Fistore.c')
-rw-r--r--src/H5Fistore.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 2f9f3b0..1994767 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -123,11 +123,11 @@ static haddr_t H5F_istore_get_addr(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *
const hssize_t offset[]);
/* B-tree iterator callbacks */
-static H5B_iterate_t H5F_istore_iter_allocated(H5F_t *f, hid_t dxpl_id, void *left_key, haddr_t addr,
+static int H5F_istore_iter_allocated(H5F_t *f, hid_t dxpl_id, void *left_key, haddr_t addr,
void *right_key, void *_udata);
-static H5B_iterate_t H5F_istore_iter_dump(H5F_t *f, hid_t dxpl_id, void *left_key, haddr_t addr,
+static int H5F_istore_iter_dump(H5F_t *f, hid_t dxpl_id, void *left_key, haddr_t addr,
void *right_key, void *_udata);
-static H5B_iterate_t H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t addr,
+static int H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t addr,
void *_rt_key, void *_udata);
/* B-tree callbacks */
@@ -789,7 +789,7 @@ done:
* Changed to callback from H5B_iterate
*-------------------------------------------------------------------------
*/
-static H5B_iterate_t
+static int
H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, haddr_t UNUSED addr,
void UNUSED *_rt_key, void *_udata)
{
@@ -825,7 +825,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key,
* Changed to callback from H5B_iterate
*-------------------------------------------------------------------------
*/
-static H5B_iterate_t
+static int
H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, haddr_t UNUSED addr,
void UNUSED *_rt_key, void *_udata)
{
@@ -2600,7 +2600,7 @@ done:
*
*-------------------------------------------------------------------------
*/
-static H5B_iterate_t
+static int
H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED addr,
void UNUSED *_rt_key, void *_udata)
{
@@ -2608,7 +2608,7 @@ H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED a
H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key;
unsigned u;
H5F_istore_ud1_t udata;
- H5B_iterate_t ret_value=H5B_ITER_CONT; /* Return value */
+ int ret_value=H5B_ITER_CONT; /* Return value */
/* The LT_KEY is the left key (the one that describes the chunk). It points to a chunk of
* storage that contains the beginning of the logical address space represented by UDATA.