[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 31 insertions, 31 deletions

diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index 88fe4a5..af48329 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -237,7 +237,7 @@ H5D_btree_get_shared(const H5F_t UNUSED *f, const void *_udata)
 {
     const H5D_chunk_common_ud_t *udata = (const H5D_chunk_common_ud_t *) _udata;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_get_shared)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(udata);
     HDassert(udata->storage);
@@ -278,7 +278,7 @@ H5D_btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
     unsigned		u;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_new_node)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(f);
@@ -350,7 +350,7 @@ H5D_btree_cmp2(void *_lt_key, void *_udata, void *_rt_key)
     H5D_chunk_common_ud_t	*udata = (H5D_chunk_common_ud_t *) _udata;
     int		ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_cmp2)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(lt_key);
     HDassert(rt_key);
@@ -399,7 +399,7 @@ H5D_btree_cmp3(void *_lt_key, void *_udata, void *_rt_key)
     H5D_chunk_common_ud_t	*udata = (H5D_chunk_common_ud_t *) _udata;
     int		ret_value = 0;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_cmp3)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(lt_key);
     HDassert(rt_key);
@@ -466,7 +466,7 @@ H5D_btree_found(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr, const void
     unsigned		u;
     htri_t      ret_value = TRUE;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_found)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check arguments */
     HDassert(f);
@@ -534,7 +534,7 @@ H5D_btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
     unsigned		u;
     H5B_ins_t		ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_insert)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* check args */
     HDassert(f);
@@ -658,7 +658,7 @@ H5D_btree_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out *
     H5D_btree_key_t    *lt_key = (H5D_btree_key_t *)_lt_key;
     H5B_ins_t ret_value=H5B_INS_REMOVE; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_remove)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Remove raw data chunk from file */
     if(!(H5F_INTENT(f) & H5F_ACC_SWMR_WRITE)) {
@@ -695,7 +695,7 @@ H5D_btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
     size_t		ndims;
     unsigned		u;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_decode_key)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* check args */
     HDassert(shared);
@@ -733,7 +733,7 @@ H5D_btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
     size_t		ndims;
     unsigned		u;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_encode_key)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* check args */
     HDassert(shared);
@@ -773,7 +773,7 @@ H5D_btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
     const H5D_btree_dbg_t	*udata = (const H5D_btree_dbg_t *)_udata;
     unsigned		u;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_debug_key)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(key);
 
@@ -807,7 +807,7 @@ H5D_btree_shared_create(const H5F_t *f, H5O_storage_chunk_t *store, unsigned ndi
     size_t	sizeof_rkey;	        /* Size of raw (disk) key	     */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_shared_create)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Set the raw key size */
     sizeof_rkey = 4 +			/*storage size		*/
@@ -851,7 +851,7 @@ H5D_btree_create_flush_dep(void *_key, void *_udata, void *parent)
     H5D_chunk_common_ud_t       *udata = (H5D_chunk_common_ud_t *) _udata;
     int                         ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_create_flush_dep)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(key);
     HDassert(udata);
@@ -894,7 +894,7 @@ H5D_btree_update_flush_dep(void *_key, void *_udata, void *old_parent,
     H5D_chunk_common_ud_t       *udata = (H5D_chunk_common_ud_t *) _udata;
     int                         ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_update_flush_dep)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(key);
     HDassert(udata);
@@ -933,7 +933,7 @@ H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t UNUSED *space
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_init)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(idx_info);
@@ -980,7 +980,7 @@ H5D_btree_idx_create(const H5D_chk_idx_info_t *idx_info)
     H5O_t *oh = NULL;                   /* Dataset's object header */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_create)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(idx_info);
@@ -1036,7 +1036,7 @@ H5D_btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
 {
     hbool_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_is_space_alloc)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(storage);
@@ -1068,7 +1068,7 @@ H5D_btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
     H5O_t       *oh = NULL;             /* Dataset's object header */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_insert)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(idx_info);
     HDassert(idx_info->f);
@@ -1127,7 +1127,7 @@ H5D_btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata
     H5O_t       *oh = NULL;             /* Dataset's object header */
     herr_t	ret_value = SUCCEED;	/* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_get_addr)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(idx_info);
     HDassert(idx_info->f);
@@ -1189,7 +1189,7 @@ H5D_btree_idx_iterate_cb(H5F_t UNUSED *f, hid_t UNUSED dxpl_id,
     H5D_chunk_rec_t chunk_rec;  /* Generic chunk record for callback */
     int ret_value;              /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR(H5D_btree_idx_iterate_cb)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Sanity check for memcpy() */
     HDcompile_assert(offsetof(H5D_chunk_rec_t, nbytes) == offsetof(H5D_btree_key_t, nbytes));
@@ -1233,7 +1233,7 @@ H5D_btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
     H5O_t       *oh = NULL;     /* Dataset's object header */
     int ret_value;              /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_iterate)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(idx_info);
     HDassert(idx_info->f);
@@ -1295,7 +1295,7 @@ H5D_btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *
     H5O_t       *oh = NULL;     /* Dataset's object header */
     herr_t	ret_value = SUCCEED;		/* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_remove)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(idx_info);
     HDassert(idx_info->f);
@@ -1353,7 +1353,7 @@ H5D_btree_idx_delete(const H5D_chk_idx_info_t *idx_info)
     H5O_t       *oh = NULL;             /* Dataset's object header */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_delete)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity checks */
     HDassert(idx_info);
@@ -1429,7 +1429,7 @@ H5D_btree_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
 {
     herr_t      ret_value = SUCCEED;        /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_btree_idx_copy_setup, idx_info_dst->dxpl_id, H5AC__COPIED_TAG, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT_TAG(idx_info_dst->dxpl_id, H5AC__COPIED_TAG, FAIL)
 
     HDassert(idx_info_src);
     HDassert(idx_info_src->f);
@@ -1478,7 +1478,7 @@ H5D_btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_copy_shutdown)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(storage_src);
     HDassert(storage_dst);
@@ -1517,7 +1517,7 @@ H5D_btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
     H5O_t *oh = NULL;                   /* Dataset's object header */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5D_btree_idx_size, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(idx_info);
@@ -1587,7 +1587,7 @@ done:
 static herr_t
 H5D_btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_reset)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(storage);
 
@@ -1621,7 +1621,7 @@ H5D_btree_idx_support(const H5D_chk_idx_info_t *idx_info,
     H5O_t *oh = NULL;                   /* Dataset's object header */
     herr_t ret_value;                   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_support)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(idx_info);
@@ -1677,7 +1677,7 @@ H5D_btree_idx_unsupport(const H5D_chk_idx_info_t *idx_info,
     H5O_t *oh = NULL;                   /* Dataset's object header */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_unsupport)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(idx_info);
@@ -1727,7 +1727,7 @@ done:
 static herr_t
 H5D_btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_dump)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(storage);
     HDassert(stream);
@@ -1755,7 +1755,7 @@ H5D_btree_idx_dest(const H5D_chk_idx_info_t *idx_info)
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_dest)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(idx_info);
     HDassert(idx_info->f);
@@ -1795,7 +1795,7 @@ H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent
     hbool_t     shared_init = FALSE;    /* Whether B-tree shared info is initialized */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5D_btree_debug, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Reset "fake" storage info */
     HDmemset(&storage, 0, sizeof(storage));