summaryrefslogtreecommitdiffstats
path: root/src/H5Distore.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2002-11-25 17:59:14 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2002-11-25 17:59:14 (GMT)
commit8333adf8ffc1265440aefad62e0cd9ab33175bd7 (patch)
treedc4321c2e92663f32f83c9feab57aaddab839f57 /src/H5Distore.c
parentb4b718b9297c479a3d1177209dcf1214d7de27a4 (diff)
downloadhdf5-8333adf8ffc1265440aefad62e0cd9ab33175bd7.zip
hdf5-8333adf8ffc1265440aefad62e0cd9ab33175bd7.tar.gz
hdf5-8333adf8ffc1265440aefad62e0cd9ab33175bd7.tar.bz2
[svn-r6136]
Purpose: new functions Description: H5Gget_num_objs, H5Gget_objname_by_idx and H5Gget_objtype_by_idx. Platforms tested: modi4, arabica, eirene Misc. update: RELEASE.txt updated.
Diffstat (limited to 'src/H5Distore.c')
-rw-r--r--src/H5Distore.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 147e143..ea74165 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -122,9 +122,9 @@ static H5B_ins_t H5F_istore_insert(H5F_t *f, haddr_t addr, void *_lt_key,
void *_udata, void *_rt_key,
hbool_t *rt_key_changed,
haddr_t *new_node/*out*/);
-static herr_t H5F_istore_iter_allocated(H5F_t *f, void *left_key, haddr_t addr,
+static H5B_iterate_t H5F_istore_iter_allocated(H5F_t *f, void *left_key, haddr_t addr,
void *right_key, void *_udata);
-static herr_t H5F_istore_iter_dump(H5F_t *f, void *left_key, haddr_t addr,
+static H5B_iterate_t H5F_istore_iter_dump(H5F_t *f, void *left_key, haddr_t addr,
void *right_key, void *_udata);
static herr_t H5F_istore_decode_key(H5F_t *f, H5B_t *bt, uint8_t *raw,
void *_key);
@@ -134,7 +134,7 @@ static herr_t H5F_istore_debug_key(FILE *stream, int indent, int fwidth,
const void *key, const void *udata);
static haddr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout,
const hssize_t offset[]);
-static herr_t H5F_istore_prune_extent(H5F_t *f, void *_lt_key, haddr_t addr,
+static H5B_iterate_t H5F_istore_prune_extent(H5F_t *f, void *_lt_key, haddr_t addr,
void *_rt_key, void *_udata);
static H5B_ins_t H5F_istore_remove( H5F_t *f, haddr_t addr, void *_lt_key,
hbool_t *lt_key_changed, void *_udata, void *_rt_key,
@@ -768,7 +768,7 @@ done:
* Changed to callback from H5B_iterate
*-------------------------------------------------------------------------
*/
-static herr_t
+static H5B_iterate_t
H5F_istore_iter_allocated (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
void UNUSED *_rt_key, void *_udata)
{
@@ -779,7 +779,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
bt_udata->total_storage += lt_key->nbytes;
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE(H5B_ITER_CONT);
} /* H5F_istore_iter_allocated() */
@@ -804,7 +804,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
* Changed to callback from H5B_iterate
*-------------------------------------------------------------------------
*/
-static herr_t
+static H5B_iterate_t
H5F_istore_iter_dump (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
void UNUSED *_rt_key, void *_udata)
{
@@ -832,7 +832,7 @@ H5F_istore_iter_dump (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
bt_udata->total_storage++;
}
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE(H5B_ITER_CONT);
} /* H5F_istore_iter_dump() */
@@ -2737,7 +2737,7 @@ done:
*
*-------------------------------------------------------------------------
*/
-static herr_t
+static H5B_iterate_t
H5F_istore_prune_extent(H5F_t *f, void *_lt_key, haddr_t UNUSED addr,
void UNUSED *_rt_key, void *_udata)
{
@@ -2745,7 +2745,7 @@ H5F_istore_prune_extent(H5F_t *f, void *_lt_key, haddr_t UNUSED addr,
H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key;
unsigned u;
H5F_istore_ud1_t udata;
- herr_t ret_value=SUCCEED; /* Return value */
+ H5B_iterate_t 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.
@@ -2771,7 +2771,7 @@ H5F_istore_prune_extent(H5F_t *f, void *_lt_key, haddr_t UNUSED addr,
/* Remove */
if(H5B_remove(f, H5B_ISTORE, bt_udata->mesg.addr, &udata) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to remove entry");
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5B_ITER_ERROR, "unable to remove entry");
break;
} /* end if */